Merge branch '13083-v1-older-releases' into 13083-ruby-shim

8 files changed, 99 insertions, 23 deletions

diff --git a/.dockerignore b/.dockerignore
index 6b8710a..1d4e811 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +1,2 @@
 .git
+.env.*
diff --git a/.env.12-2-stable b/.env.12-2-stable
new file mode 100644
index 0000000..3e94bc7
--- /dev/null
+++ b/.env.12-2-stable
@@ -0,0 +1,3 @@
+FEATURE_RUBY_REPORT 'false'
+LM_REPORT_VERSION 1
+LM_V1_CANONICALIZE 'false'
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/.gitignore b/.gitignore
index a9a5aec..8462f59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 tmp
+Dockerfile.env
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2d71489..e157f53 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,8 +89,13 @@ QA:go:
     - 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}
-    - docker pull $SOURCE_IMAGE
-    - docker tag $SOURCE_IMAGE $TARGET_IMAGE
+    - |
+      if [ -z "$DOTENV" ]; then
+        docker pull $SOURCE_IMAGE
+        docker tag $SOURCE_IMAGE $TARGET_IMAGE
+      else
+        ./bin/docker-dotenv
+      fi
     - docker push $TARGET_IMAGE
 
 .docker_tag_python2:
@@ -151,12 +156,6 @@ version python2:
   only:
     - tags
 
-.release_python2:
-  extends: .docker_tag_python2
-  stage: release
-  only:
-    - tags
-
 major:
   extends: .release
   variables:
@@ -167,48 +166,80 @@ latest:
 
 12-3-stable:
   extends: .release
+  variables:
+    DOTENV: ".env.12-3-stable"
 
 12-2-stable:
   extends: .release
+  variables:
+    DOTENV: ".env.12-2-stable"
 
 12-1-stable:
-  extends: .release_python2
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 12-0-stable:
-  extends: .release_python2
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-11-stable:
-  extends: .release_python2
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-10-stable:
-  extends: .release_python2
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-9-stable:
-  extends: .release_python2
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-8-stable:
-  extends: .release_python2
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-7-stable:
-  extends: .release_python2
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-6-stable:
-  extends: .release_python2
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-5-stable:
-  extends: .release_python2
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-4-stable:
-  extends: .release_python2
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-3-stable:
-  extends: .release_python2
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-2-stable:
-  extends: .release_python2
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-1-stable:
-  extends: .release_python2
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
 
 11-0-stable:
-  extends: .release_python2
+  extends: .release
+  variables:
+    DOTENV: ".env.legacy"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 849da2b..53d08d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # GitLab License management changelog
 
-## 1.7.0
+## v1.7.0
 
 - Convert HTML to JSON transformation to generating a JSON report directly.
 
diff --git a/bin/docker-dotenv b/bin/docker-dotenv
new file mode 100755
index 0000000..ca025c0
--- /dev/null
+++ b/bin/docker-dotenv
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# input:
+# SOURCE_IMAGE: Image name for the source image
+# TARGET_IMAGE: Name of image to build
+# DOTENV: The name of the .env.* file that contains the default env vars to export.
+#   e.g. DOTENV=".env.12-3-stable"
+
+set -e
+
+cd "$(dirname "$0")/.."
+DOCKERFILE=Dockerfile.env
+
+rm -f $DOCKERFILE
+touch $DOCKERFILE
+echo "FROM $SOURCE_IMAGE" > $DOCKERFILE
+
+echo "Reading... $DOTENV"
+cat $DOTENV
+
+while IFS= read -r line; do
+  echo "ENV $line" >> $DOCKERFILE
+done < $DOTENV
+
+echo "Pulling... $SOURCE_IMAGE"
+docker pull $SOURCE_IMAGE
+
+echo "Building... $DOCKERFILE and tagging $TARGET_IMAGE"
+cat $DOCKERFILE
+docker build -t $TARGET_IMAGE -f $DOCKERFILE .
+
+echo "Verifying env..."
+docker run --entrypoint='' $TARGET_IMAGE env