From fa501723ff51d5d0cfd4e345c249d2c0ddc77814 Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Thu, 22 Aug 2019 11:50:34 -0600
Subject: read .env files instead of hardcoding in .gitlab-ci.yml file

---
 .dockerignore     |  1 +
 .env.12-3-stable  |  3 +++
 .env.legacy       |  4 ++++
 .gitlab-ci.yml    | 13 +++++++------
 bin/docker-dotenv |  8 ++++----
 5 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 .env.12-3-stable
 create mode 100644 .env.legacy

diff --git a/.dockerignore b/.dockerignore
index 6b8710a..1d4e811 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +1,2 @@
 .git
+.env.*
diff --git a/.env.12-3-stable b/.env.12-3-stable
new file mode 100644
index 0000000..edb6a67
--- /dev/null
+++ b/.env.12-3-stable
@@ -0,0 +1,3 @@
+FEATURE_RUBY_REPORT 'true'
+LM_REPORT_VERSION 1
+LM_V1_CANONICALIZE 'false'
diff --git a/.env.legacy b/.env.legacy
new file mode 100644
index 0000000..bba5f11
--- /dev/null
+++ b/.env.legacy
@@ -0,0 +1,4 @@
+FEATURE_RUBY_REPORT 'false'
+LM_PYTHON_VERSION 2.7
+LM_REPORT_VERSION 1
+LM_V1_CANONICALIZE 'false'
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14584f4..8ce16d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,9 +49,7 @@ container_scanning:
       - results/
     when: always
 
-.legacy-v1-variables:
-  variables:
-    DOTENV: "FEATURE_RUBY_REPORT 'false';LM_REPORT_VERSION 1;LM_V1_CANONICALIZE 'false';"
+.dotenv:
   script:
     - docker info
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
@@ -60,6 +58,11 @@ container_scanning:
     - ./bin/docker-inject-env
     - docker push $TARGET_IMAGE
 
+.legacy-v1-variables:
+  extends: .dotenv
+  variables:
+    DOTENV: ".env.legacy"
+
 QA:java-maven:
   extends: .QA
   variables:
@@ -179,9 +182,7 @@ latest:
 12-3-stable:
   extends: .release
   variables:
-    FEATURE_RUBY_REPORT: 'true'
-    LM_REPORT_VERSION: 1
-    LM_V1_CANONICALIZE: 'false'
+    DOTENV: ".env.legacy"
 
 12-2-stable:
   extends: .release
diff --git a/bin/docker-dotenv b/bin/docker-dotenv
index e404cec..1c9544d 100755
--- a/bin/docker-dotenv
+++ b/bin/docker-dotenv
@@ -15,10 +15,10 @@ rm -f $DOCKERFILE
 touch $DOCKERFILE
 echo "FROM $SOURCE_IMAGE" > $DOCKERFILE
 
-IFS=';' read -ra EACH_ENV <<< "$DOTENV"
-for i in "${EACH_ENV[@]}"; do
-  echo "ENV $i" >> $DOCKERFILE
-done
+while IFS= read -r line; do
+  echo "ENV $line" >> $DOCKERFILE
+done < $DOTENV
 
 docker pull $SOURCE_IMAGE
 docker build -t $TARGET_IMAGE -f $DOCKERFILE .
+docker run $TARGET_IMAGE env
-- 
cgit v1.2.3