From d48c4f3313aa23fa9d5fc79dd71dfb27ea5b2cd0 Mon Sep 17 00:00:00 2001 From: ITQ Date: Sat, 1 Mar 2025 01:21:49 +0300 Subject: [PATCH 1/2] ci: added staticfiles --- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa3e9a2..113848e 100644 --- a/.gitlab-ci.yml +++ b/.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 From d40a4d0caa8b1a3a0e413b8c5192857801bde7f1 Mon Sep 17 00:00:00 2001 From: ITQ Date: Sat, 1 Mar 2025 01:22:10 +0300 Subject: [PATCH 2/2] build: changed build to image directives --- compose.yaml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/compose.yaml b/compose.yaml index 3009f05..91b6a69 100644 --- a/compose.yaml +++ b/compose.yaml @@ -2,9 +2,7 @@ name: project_name services: backend: - build: - context: ./services/backend - dockerfile: Dockerfile + image: gitlab.prodcontest.ru:5050/team-15/project/backend:latest 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: - context: ./services/backend - dockerfile: Dockerfile.staticfiles + image: gitlab.prodcontest.ru:5050/team-15/project/backend-staticfiles:latest env_file: - path: ./infrastructure/backend/.env.template required: true @@ -82,9 +78,7 @@ services: restart: unless-stopped backend-celery-worker: - build: - context: ./services/backend - dockerfile: Dockerfile + image: gitlab.prodcontest.ru:5050/team-15/project/backend:latest command: celery -A config worker -l INFO depends_on: redis: @@ -120,9 +114,7 @@ services: restart: unless-stopped frontend: - build: - context: ./services/frontend - dockerfile: Dockerfile + image: gitlab.prodcontest.ru:5050/team-15/project/frontend:latest env_file: - path: ./infrastructure/frontend/.env.template required: true