Merge remote-tracking branch 'origin/master'

.gitlab-ci.yml

@@ -41,6 +41,13 @@ build_backend:
     DOCKERFILE_PATH: "Dockerfile"
     IMAGE_NAME: "$CI_REGISTRY_IMAGE/backend"
 
+build_backend-staticfiles:
+  <<: *build-template
+  variables:
+    CONTEXT: "${CI_PROJECT_DIR}/services/backend-staticfiles"
+    DOCKERFILE_PATH: "Dockerfile"
+    IMAGE_NAME: "$CI_REGISTRY_IMAGE/backend-staticfiles"
+
 deploy:
   image: alpine:latest
   stage: deploy

compose.yaml

@@ -2,9 +2,7 @@ name: project_name
 
 services:
   backend:
-    build:
+    image: gitlab.prodcontest.ru:5050/team-15/project/backend:latest
-      context: ./services/backend
-      dockerfile: Dockerfile
     depends_on:
       backend-initdb:
         restart: false
@@ -36,7 +34,7 @@ services:
     restart: unless-stopped
 
   backend-initdb:
-    image: 
+    image: gitlab.prodcontest.ru:5050/team-15/project/backend:latest
     command: ./scripts/initdb
     depends_on:
       postgres:
@@ -58,9 +56,7 @@ services:
         required: false
 
   backend-staticfiles:
-    build:
+    image: gitlab.prodcontest.ru:5050/team-15/project/backend-staticfiles:latest
-      context: ./services/backend
-      dockerfile: Dockerfile.staticfiles
     env_file:
       - path: ./infrastructure/backend/.env.template
         required: true
@@ -82,9 +78,7 @@ services:
     restart: unless-stopped
 
   backend-celery-worker:
-    build:
+    image: gitlab.prodcontest.ru:5050/team-15/project/backend:latest
-      context: ./services/backend
-      dockerfile: Dockerfile
     command: celery -A config worker -l INFO
     depends_on:
       redis:
@@ -120,9 +114,7 @@ services:
     restart: unless-stopped
 
   frontend:
-    build:
+    image: gitlab.prodcontest.ru:5050/team-15/project/frontend:latest
-      context: ./services/frontend
-      dockerfile: Dockerfile
     env_file:
       - path: ./infrastructure/frontend/.env.template
         required: true