From e99d5d4de2e9ae4ad6fe85431c3637f45d679484 Mon Sep 17 00:00:00 2001
From: Ilya Fedorov <fedy95@protonmail.com>
Date: Fri, 24 Sep 2021 15:04:47 +0000
Subject: [PATCH] turn on release jobs

---
 .gitlab-ci.yml                          | 2 ++
 devops/gitlab/release/1_release-tag.yml | 7 +++++--
 docker-compose.yml                      | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1704581..07cd8a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,4 +4,6 @@ include:
       ref: master
       file: /${CI_PROJECT_PATH}.yml
     - local: /devops/gitlab/merge_requests/build/1_build.yml
+    - local: /devops/gitlab/release/1_release-tag.yml
+    - local: /devops/gitlab/release/2_deploy.yml
 ...
diff --git a/devops/gitlab/release/1_release-tag.yml b/devops/gitlab/release/1_release-tag.yml
index df23675..280523b 100644
--- a/devops/gitlab/release/1_release-tag.yml
+++ b/devops/gitlab/release/1_release-tag.yml
@@ -1,6 +1,6 @@
 ---
 release-tag:
-    stage: release
+    stage: release-tag
     only:
         - tags
     tags:
@@ -12,7 +12,10 @@ release-tag:
     before_script:
         - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin "$DOCKER_URL"
     script:
-        - docker build -t ${PROJECT_IMAGE}:latest image -f image/Dockerfile
+        - |
+            docker build --file devops/docker/php/Dockerfile \
+              --tag ${PROJECT_IMAGE}:latest \
+              --target=test .
         - docker push ${PROJECT_IMAGE}:latest
     after_script:
         - docker logout "$DOCKER_URL"
diff --git a/docker-compose.yml b/docker-compose.yml
index a8053b9..8795047 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.4"
 
 services:
     app:
-        image: registry.fedy95.com/dev/notification-provider:latest
+        image: registry.fedy95.com/dev-notification-provider:latest
         restart: unless-stopped
 
         env_file: