inline .dotenv and .dotenv-legacy jobs

1 files changed, 48 insertions, 33 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb8bea7..b4c7203 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,24 +49,6 @@ container_scanning:
       - results/
     when: always
 
-.dotenv:
-  image: docker:stable
-  stage: release
-  only:
-    - tags
-  script:
-    - docker info
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - export SOURCE_IMAGE=$TMP_IMAGE
-    - export TARGET_IMAGE=$CI_REGISTRY_IMAGE:${IMAGE_TAG:-$CI_JOB_NAME}
-    - ./bin/docker-inject-env
-    - docker push $TARGET_IMAGE
-
-.dotenv-legacy:
-  extends: .dotenv
-  variables:
-    DOTENV: ".env.legacy"
-
 QA:java-maven:
   extends: .QA
   variables:
@@ -108,7 +90,12 @@ QA:go:
     - export SOURCE_IMAGE=$TMP_IMAGE
     - export TARGET_IMAGE=$CI_REGISTRY_IMAGE:${IMAGE_TAG:-$CI_JOB_NAME}
     - docker pull $SOURCE_IMAGE
-    - docker tag $SOURCE_IMAGE $TARGET_IMAGE
+    - |
+      if [ -z "$DOTENV" ]; then
+        docker tag $SOURCE_IMAGE $TARGET_IMAGE
+      else
+        ./bin/docker-dotenv
+      fi
     - docker push $TARGET_IMAGE
 
 .docker_tag_python2:
@@ -188,43 +175,71 @@ latest:
     DOTENV: ".env.12-2-stable"
 
 12-1-stable:
-  extends: .dotenv-legacy
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 12-0-stable:
-  extends: .dotenv-legacy
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-11-stable:
-  extends: .dotenv-legacy
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-10-stable:
-  extends: .dotenv-legacy
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-9-stable:
-  extends: .dotenv-legacy
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-8-stable:
-  extends: .dotenv-legacy
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-7-stable:
-  extends: .dotenv-legacy
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-6-stable:
-  extends: .dotenv-legacy
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-5-stable:
-  extends: .dotenv-legacy
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-4-stable:
-  extends: .dotenv-legacy
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-3-stable:
-  extends: .dotenv-legacy
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-2-stable:
-  extends: .dotenv-legacy
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-1-stable:
-  extends: .dotenv-legacy
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-0-stable:
-  extends: .dotenv-legacy
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"