From 7adf7419cb117a2bcf0b6274cd2ed0b8918ee6a4 Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Thu, 22 Aug 2019 11:57:39 -0600
Subject: delegate to dotenv-legacy to inject specific environment variables

---
 .gitlab-ci.yml | 52 ++++++++++++++++------------------------------------
 1 file changed, 16 insertions(+), 36 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ce16d4..678017b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,7 @@ container_scanning:
     - ./bin/docker-inject-env
     - docker push $TARGET_IMAGE
 
-.legacy-v1-variables:
+.dotenv-legacy:
   extends: .dotenv
   variables:
     DOTENV: ".env.legacy"
@@ -165,12 +165,6 @@ version python2:
   only:
     - tags
 
-.release_python2:
-  extends: .docker_tag_python2
-  stage: release
-  only:
-    - tags
-
 major:
   extends: .release
   variables:
@@ -186,60 +180,46 @@ latest:
 
 12-2-stable:
   extends: .release
-  extends: .legacy-v1-variables
+  extends: .dotenv-legacy
 
 12-1-stable:
-  extends: .release_python2
-  extends: .legacy-v1-variables
+  extends: .dotenv-legacy
 
 12-0-stable:
-  extends: .release_python2
-  extends: .legacy-v1-variables
+  extends: .dotenv-legacy
 
 11-11-stable:
-  extends: .release_python2
-  extends: .legacy-v1-variables
+  extends: .dotenv-legacy
 
 11-10-stable:
-  extends: .release_python2
-  extends: .legacy-v1-variables
+  extends: .dotenv-legacy
 
 11-9-stable:
-  extends: .release_python2
-  extends: .legacy-v1-variables
+  extends: .dotenv-legacy
 
 11-8-stable:
-  extends: .release_python2
-  extends: .legacy-v1-variables
+  extends: .dotenv-legacy
 
 11-7-stable:
-  extends: .release_python2
-  extends: .legacy-v1-variables
+  extends: .dotenv-legacy
 
 11-6-stable:
-  extends: .release_python2
-  extends: .legacy-v1-variables
+  extends: .dotenv-legacy
 
 11-5-stable:
-  extends: .release_python2
-  extends: .legacy-v1-variables
+  extends: .dotenv-legacy
 
 11-4-stable:
-  extends: .release_python2
-  extends: .legacy-v1-variables
+  extends: .dotenv-legacy
 
 11-3-stable:
-  extends: .release_python2
-  extends: .legacy-v1-variables
+  extends: .dotenv-legacy
 
 11-2-stable:
-  extends: .release_python2
-  extends: .legacy-v1-variables
+  extends: .dotenv-legacy
 
 11-1-stable:
-  extends: .release_python2
-  extends: .legacy-v1-variables
+  extends: .dotenv-legacy
 
 11-0-stable:
-  extends: .release_python2
-  extends: .legacy-v1-variables
+  extends: .dotenv-legacy
-- 
cgit v1.2.3