Merge branch 'main' of gitlab.com:prod-hackathon-moscow/hackaton

.gitlab-ci.yml

@@ -106,7 +106,7 @@ cache:
   image: curlimages/curl:latest
   script:
     - |
-      response=$(curl -s -w "\n%{http_code}" -X POST \
+      curl -sf -X POST \
         -H "Content-Type: application/json" \
         -H "Authorization: Bearer $WEBHOOK_SECRET_TOKEN" \
         -H "Webhook-Identifier: $WEBHOOK_BYPASS_TOKEN" \
@@ -153,29 +153,23 @@ cache:
   script:
     - |
       set -euo pipefail
-      SOURCE_IMAGE="$IMAGE_NAME:$CI_COMMIT_SHA"
-      docker pull "$SOURCE_IMAGE"
-      DANGEROUS_TAGS=""
-      if [ -n "$CI_COMMIT_TAG" ]; then
-        DANGEROUS_TAGS="$DANGEROUS_TAGS $CI_COMMIT_TAG"
+      IMAGE="$IMAGE_NAME:$CI_COMMIT_SHA"
+      docker pull "$IMAGE"
+
+      if [ -n "${CI_COMMIT_TAG:-}" ]; then
+        docker tag "$IMAGE" "$IMAGE_NAME:$CI_COMMIT_TAG"
+        docker push "$IMAGE_NAME:$CI_COMMIT_TAG"
       fi
-      if [ -n "$CI_COMMIT_BRANCH" ]; then
+
+      if [ -n "${CI_COMMIT_BRANCH:-}" ]; then
+        docker tag "$IMAGE" "$IMAGE_NAME:$CI_COMMIT_REF_SLUG"
+        docker push "$IMAGE_NAME:$CI_COMMIT_REF_SLUG"
+
         if [ "$CI_COMMIT_BRANCH" = "$CI_DEFAULT_BRANCH" ]; then
-          DANGEROUS_TAGS="$DANGEROUS_TAGS latest $CI_COMMIT_REF_SLUG"
-        else
-          DANGEROUS_TAGS="$DANGEROUS_TAGS $CI_COMMIT_REF_SLUG"
+          docker tag "$IMAGE" "$IMAGE_NAME:latest"
+          docker push "$IMAGE_NAME:latest"
         fi
       fi
-      if [ -z "$DANGEROUS_TAGS" ]; then
-        echo "No tags to publish."
-        exit 0
-      fi
-      for TAG in $DANGEROUS_TAGS; do
-        [ -z "$TAG" ] && continue
-        TARGET_IMAGE="$IMAGE_NAME:$TAG"
-        docker tag "$SOURCE_IMAGE" "$TARGET_IMAGE"
-        docker push "$TARGET_IMAGE"
-      done
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
     - if: $CI_COMMIT_TAG
@@ -240,8 +234,9 @@ test:
       --profile migrations
       --profile tests
   script:
-    - export PROFILES="$(printf '%s ' $COMPOSE_PROFILES)"
     - apk add --no-cache docker-compose
+    - export PROFILES="$(printf '%s ' $COMPOSE_PROFILES)"
+    - cp "$TEST_STAGE_FIREBASE_CONF" ./infrastructure/configs/backend/firebase.json
     - |
       (
         while true; do