diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f62fbc0..ed4d67e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,11 +30,16 @@ build_and_push: - for i in $(seq 1 30); do docker info && break || sleep 1; done - echo "Logging in to registry ${REGISTRY_URL}" - echo "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USERNAME" --password-stdin "$REGISTRY_URL" - - export IMAGE_NAME="${REGISTRY_URL}/${IMAGE_PATH}:${IMAGE_TAG}" - - echo "Building image ${IMAGE_NAME}" - - docker build -t "$IMAGE_NAME" -f ./compose/prod/python/Dockerfile --no-cache . - - echo "Pushing image ${IMAGE_NAME}" - - docker push "$IMAGE_NAME" + - export DJANGO_IMAGE_NAME="${REGISTRY_URL}/${DJANGO_IMAGE_PATH}:${IMAGE_TAG}" + - echo "Building image ${DJANGO_IMAGE_NAME}" + - docker build -t "$DJANGO_IMAGE_NAME" -f ./compose/prod/django/Dockerfile --no-cache . + - echo "Pushing image ${DJANGO_IMAGE_NAME}" + - docker push "$DJANGO_IMAGE_NAME" + - export CELERY_IMAGE_NAME="${REGISTRY_URL}/${CELERY_IMAGE_PATH}:${IMAGE_TAG}" + - echo "Building Celery image ${CELERY_IMAGE_NAME}" + - docker build -t "$CELERY_IMAGE_NAME" -f ./compose/prod/celery/Dockerfile --no-cache . + - echo "Pushing Celery image ${CELERY_IMAGE_NAME}" + - docker push "$CELERY_IMAGE_NAME" rules: - if: $CI_COMMIT_TAG when: always