Merge remote-tracking branch 'origin/master' into release_front

# Conflicts:
#	.gitlab-ci.yml

.gitlab-ci.yml

@@ -17,9 +17,9 @@ deploy-back-job:
     - docker rm my-bar
     - docker rmi my-bar
     - echo "Сборка образа докер"
-    - docker build -t my-bar .
+    - docker build -t my-bar . --no-cache
     - echo "Запуск докер контейнера"
-    - docker run --name my-bar --restart=always -p 8091:8080 -d my-bar
+    - docker run --name my-bar --restart=always -p 8091:8080 -d -e COCKTAIL_PHOTO_PATH=/front/assets/cocktails -v /mnt/sdb1/my-bar-front/build:/front my-bar
     - echo "Деплой завершен"
 
 deploy-front-job: