From 532e36e31622cba5566e09e23e1fb3cc84d0c666 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 10:23:40 -0600 Subject: release old images using html2json.js script and v1 report only --- .gitlab-ci.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d71489..69756f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,6 +49,12 @@ container_scanning: - results/ when: always +.legacy-v1-variables: + variables: + FEATURE_RUBY_REPORT: 'false' + LM_REPORT_VERSION: 1 + LM_V1_CANONICALIZE: 'false' + QA:java-maven: extends: .QA variables: @@ -170,45 +176,60 @@ latest: 12-2-stable: extends: .release + extends: .legacy-v1-variables 12-1-stable: extends: .release_python2 + extends: .legacy-v1-variables 12-0-stable: extends: .release_python2 + extends: .legacy-v1-variables 11-11-stable: extends: .release_python2 + extends: .legacy-v1-variables 11-10-stable: extends: .release_python2 + extends: .legacy-v1-variables 11-9-stable: extends: .release_python2 + extends: .legacy-v1-variables 11-8-stable: extends: .release_python2 + extends: .legacy-v1-variables 11-7-stable: extends: .release_python2 + extends: .legacy-v1-variables 11-6-stable: extends: .release_python2 + extends: .legacy-v1-variables 11-5-stable: extends: .release_python2 + extends: .legacy-v1-variables 11-4-stable: extends: .release_python2 + extends: .legacy-v1-variables 11-3-stable: extends: .release_python2 + extends: .legacy-v1-variables 11-2-stable: extends: .release_python2 + extends: .legacy-v1-variables 11-1-stable: extends: .release_python2 + extends: .legacy-v1-variables 11-0-stable: extends: .release_python2 + extends: .legacy-v1-variables -- cgit v1.2.3 From b94b08f7441372074a0b0286837eb25c2ff9ad11 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 10:25:20 -0600 Subject: release 12-3 image with v1 report generated via direct ruby integration --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69756f0..aa62a7e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -173,6 +173,10 @@ latest: 12-3-stable: extends: .release + variables: + FEATURE_RUBY_REPORT: 'true' + LM_REPORT_VERSION: 1 + LM_V1_CANONICALIZE: 'false' 12-2-stable: extends: .release -- cgit v1.2.3 From ead82e380d385450df7e507d1cb9cca15804ee5a Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 11:38:50 -0600 Subject: create script to inject environment variables into an existing image --- .gitignore | 1 + .gitlab-ci.yml | 11 ++++++++--- bin/docker-inject-env | 24 ++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100755 bin/docker-inject-env 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 aa62a7e..14584f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,9 +51,14 @@ container_scanning: .legacy-v1-variables: variables: - FEATURE_RUBY_REPORT: 'false' - LM_REPORT_VERSION: 1 - LM_V1_CANONICALIZE: 'false' + DOTENV: "FEATURE_RUBY_REPORT 'false';LM_REPORT_VERSION 1;LM_V1_CANONICALIZE 'false';" + 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 QA:java-maven: extends: .QA diff --git a/bin/docker-inject-env b/bin/docker-inject-env new file mode 100755 index 0000000..e404cec --- /dev/null +++ b/bin/docker-inject-env @@ -0,0 +1,24 @@ +#!/bin/sh + +# input: +# SOURCE_IMAGE: Image name for the source image +# TARGET_IMAGE: Name of image to build +# DOTENV: The list of env variables delimited by a ; +# e.g. DOTENV="FEATURE_RUBY_REPORT 'false';LM_REPORT_VERSION 1;" + +set -e + +cd "$(dirname "$0")/.." +DOCKERFILE=Dockerfile.env + +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 + +docker pull $SOURCE_IMAGE +docker build -t $TARGET_IMAGE -f $DOCKERFILE . -- cgit v1.2.3 From 8e19a8a9e849883e47daa4873d6c992537eaa9e1 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 11:39:41 -0600 Subject: rename script to docker-dotenv --- bin/docker-dotenv | 24 ++++++++++++++++++++++++ bin/docker-inject-env | 24 ------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) create mode 100755 bin/docker-dotenv delete mode 100755 bin/docker-inject-env diff --git a/bin/docker-dotenv b/bin/docker-dotenv new file mode 100755 index 0000000..e404cec --- /dev/null +++ b/bin/docker-dotenv @@ -0,0 +1,24 @@ +#!/bin/sh + +# input: +# SOURCE_IMAGE: Image name for the source image +# TARGET_IMAGE: Name of image to build +# DOTENV: The list of env variables delimited by a ; +# e.g. DOTENV="FEATURE_RUBY_REPORT 'false';LM_REPORT_VERSION 1;" + +set -e + +cd "$(dirname "$0")/.." +DOCKERFILE=Dockerfile.env + +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 + +docker pull $SOURCE_IMAGE +docker build -t $TARGET_IMAGE -f $DOCKERFILE . diff --git a/bin/docker-inject-env b/bin/docker-inject-env deleted file mode 100755 index e404cec..0000000 --- a/bin/docker-inject-env +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -# input: -# SOURCE_IMAGE: Image name for the source image -# TARGET_IMAGE: Name of image to build -# DOTENV: The list of env variables delimited by a ; -# e.g. DOTENV="FEATURE_RUBY_REPORT 'false';LM_REPORT_VERSION 1;" - -set -e - -cd "$(dirname "$0")/.." -DOCKERFILE=Dockerfile.env - -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 - -docker pull $SOURCE_IMAGE -docker build -t $TARGET_IMAGE -f $DOCKERFILE . -- cgit v1.2.3 From fa501723ff51d5d0cfd4e345c249d2c0ddc77814 Mon Sep 17 00:00:00 2001 From: mo khan 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 From cc75be07e97c73ab7da419912abbc123c756312d Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 11:51:29 -0600 Subject: update example documentation --- bin/docker-dotenv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/docker-dotenv b/bin/docker-dotenv index 1c9544d..3bc9818 100755 --- a/bin/docker-dotenv +++ b/bin/docker-dotenv @@ -3,8 +3,8 @@ # input: # SOURCE_IMAGE: Image name for the source image # TARGET_IMAGE: Name of image to build -# DOTENV: The list of env variables delimited by a ; -# e.g. DOTENV="FEATURE_RUBY_REPORT 'false';LM_REPORT_VERSION 1;" +# DOTENV: The name of the .env.* file that contains the default env vars to export. +# e.g. DOTENV=".env.12-3-stable" set -e -- cgit v1.2.3 From f18510931631146f25e6d5c5dc010edee9ad3e3a Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 11:54:58 -0600 Subject: print temporary dockerfile content --- bin/docker-dotenv | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bin/docker-dotenv b/bin/docker-dotenv index 3bc9818..5f4b96c 100755 --- a/bin/docker-dotenv +++ b/bin/docker-dotenv @@ -19,6 +19,12 @@ while IFS= read -r line; do echo "ENV $line" >> $DOCKERFILE done < $DOTENV +echo "Pulling... $SOURCE_IMAGE" docker pull $SOURCE_IMAGE + +echo "Building... $DOCKERFILE" +cat $DOCKERFILE docker build -t $TARGET_IMAGE -f $DOCKERFILE . + +echo "Verifying env..." docker run $TARGET_IMAGE env -- cgit v1.2.3 From 7adf7419cb117a2bcf0b6274cd2ed0b8918ee6a4 Mon Sep 17 00:00:00 2001 From: mo khan 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 From 321fcb6ff1e208ba64a73412042dcf765a677f51 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 11:58:53 -0600 Subject: specify .env.12-3-stable --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 678017b..26d5311 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -176,7 +176,7 @@ latest: 12-3-stable: extends: .release variables: - DOTENV: ".env.legacy" + DOTENV: ".env.12-3-stable" 12-2-stable: extends: .release -- cgit v1.2.3 From 87c82558664e59a235591d1debd163c7a214694b Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 12:08:15 -0600 Subject: ensure 12-2 stable uses correct env variables --- .env.12-2-stable | 3 +++ .gitlab-ci.yml | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .env.12-2-stable 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/.gitlab-ci.yml b/.gitlab-ci.yml index 26d5311..d685161 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -180,7 +180,8 @@ latest: 12-2-stable: extends: .release - extends: .dotenv-legacy + variables: + DOTENV: ".env.12-2-stable" 12-1-stable: extends: .dotenv-legacy -- cgit v1.2.3 From ce94ec61bd99a01c640ae4ece855fd77e289487c Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 12:11:51 -0600 Subject: ensure dotenv defaults to release stages for tags only --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d685161..bb8bea7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,6 +50,10 @@ container_scanning: 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 -- cgit v1.2.3 From 72f8f3f8e1e09ead3023c1e81449200d16616f3a Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 12:23:19 -0600 Subject: add missing v --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index adcc0a9..38cf864 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. -- cgit v1.2.3 From f9f78d84f50d5ceccba26d333ef0b36ceb7f94e3 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 13:57:38 -0600 Subject: inline .dotenv and .dotenv-legacy jobs --- .gitlab-ci.yml | 81 ++++++++++++++++++++++++++++++++++------------------------ 1 file 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" -- cgit v1.2.3 From 4ec3d97df392ca472e7e674b2699c756eb7cbf64 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 14:10:25 -0600 Subject: add test job to generate testable release version. --- .gitlab-ci.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4c7203..dfe57a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,6 +49,17 @@ container_scanning: - results/ when: always +QA:test-release: + extends: .release + variables: + DOTENV: '.env.legacy' + IMAGE_TAG: 12-test-release-stable + only: + - branches + except: + - master + when: manual + QA:java-maven: extends: .QA variables: -- cgit v1.2.3 From 5e87e4ebaef6edd8ae7250a71dead5f5b2a1a506 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 14:57:30 -0600 Subject: override the entrypoint --- bin/docker-dotenv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/docker-dotenv b/bin/docker-dotenv index 5f4b96c..bfe1369 100755 --- a/bin/docker-dotenv +++ b/bin/docker-dotenv @@ -27,4 +27,4 @@ cat $DOCKERFILE docker build -t $TARGET_IMAGE -f $DOCKERFILE . echo "Verifying env..." -docker run $TARGET_IMAGE env +docker run --entrypoint='' $TARGET_IMAGE env -- cgit v1.2.3 From 1b01671a20247cffe6074b5e037af12427a0633b Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 15:28:30 -0600 Subject: try using MARJOR and CI_COMMIT_REF_SLUG --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dfe57a6..8142845 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,7 +53,7 @@ QA:test-release: extends: .release variables: DOTENV: '.env.legacy' - IMAGE_TAG: 12-test-release-stable + IMAGE_TAG: "${MAJOR}-${CI_COMMIT_REF_SLUG}-stable" only: - branches except: -- cgit v1.2.3 From 922390fd60c026c478d70690c6ee204bcc14bca2 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 15:29:50 -0600 Subject: dump dotenv file before building custom Dockerfile --- bin/docker-dotenv | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/docker-dotenv b/bin/docker-dotenv index bfe1369..ab2c6c6 100755 --- a/bin/docker-dotenv +++ b/bin/docker-dotenv @@ -15,6 +15,9 @@ 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 -- cgit v1.2.3 From e32312585b81465d596b3ced689686121a9062c6 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 16:15:47 -0600 Subject: add manual jobs for creating a 12-* test images --- .gitlab-ci.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8142845..2cf7ef6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,6 +60,21 @@ QA:test-release: - master when: manual +QA:test-release-12-3: + extends: QA:test-release + variables: + DOTENV: ".env.12-3-stable" + +QA:test-release-12-2: + extends: QA:test-release + variables: + DOTENV: ".env.12-2-stable" + +QA:test-release-12-1: + extends: QA:test-release + variables: + DOTENV: ".env.legacy" + QA:java-maven: extends: .QA variables: -- cgit v1.2.3 From 84cced338714c3eea91e3208c7dda82853efe400 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 16:18:34 -0600 Subject: override IMAGE_TAG for test release jobs --- .gitlab-ci.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2cf7ef6..3ad640a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ container_scanning: - results/ when: always -QA:test-release: +.QA:test-release: extends: .release variables: DOTENV: '.env.legacy' @@ -60,20 +60,23 @@ QA:test-release: - master when: manual -QA:test-release-12-3: - extends: QA:test-release +12-3-test-release: + extends: .QA:test-release variables: DOTENV: ".env.12-3-stable" + IMAGE_TAG: "${MAJOR}-3_${CI_COMMIT_REF_SLUG}-stable" -QA:test-release-12-2: - extends: QA:test-release +12-2-test-release: + extends: .QA:test-release variables: DOTENV: ".env.12-2-stable" + IMAGE_TAG: "${MAJOR}-2_${CI_COMMIT_REF_SLUG}-stable" -QA:test-release-12-1: - extends: QA:test-release +12-1-test-release: + extends: .QA:test-release variables: DOTENV: ".env.legacy" + IMAGE_TAG: "${MAJOR}-1_${CI_COMMIT_REF_SLUG}-stable" QA:java-maven: extends: .QA -- cgit v1.2.3 From 55d92af0a3207a89c328ae53aee50254ae49795f Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 16:48:01 -0600 Subject: print TARGET_IMAGE --- bin/docker-dotenv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/docker-dotenv b/bin/docker-dotenv index ab2c6c6..ca025c0 100755 --- a/bin/docker-dotenv +++ b/bin/docker-dotenv @@ -25,7 +25,7 @@ done < $DOTENV echo "Pulling... $SOURCE_IMAGE" docker pull $SOURCE_IMAGE -echo "Building... $DOCKERFILE" +echo "Building... $DOCKERFILE and tagging $TARGET_IMAGE" cat $DOCKERFILE docker build -t $TARGET_IMAGE -f $DOCKERFILE . -- cgit v1.2.3 From 1ae76901433b2fa92270126691b0f7c0db4e151a Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 16:52:12 -0600 Subject: test to see if before_script will export the proper env var --- .gitlab-ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ad640a..50b625c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,18 +62,23 @@ container_scanning: 12-3-test-release: extends: .QA:test-release + before_script: + - export IMAGE_TAG="${MAJOR}-3_${CI_COMMIT_REF_SLUG}-stable" variables: DOTENV: ".env.12-3-stable" IMAGE_TAG: "${MAJOR}-3_${CI_COMMIT_REF_SLUG}-stable" 12-2-test-release: extends: .QA:test-release + before_script: + - export IMAGE_TAG="${MAJOR}-2_${CI_COMMIT_REF_SLUG}-stable" variables: DOTENV: ".env.12-2-stable" - IMAGE_TAG: "${MAJOR}-2_${CI_COMMIT_REF_SLUG}-stable" 12-1-test-release: extends: .QA:test-release + before_script: + - export IMAGE_TAG="${MAJOR}-1_${CI_COMMIT_REF_SLUG}-stable" variables: DOTENV: ".env.legacy" IMAGE_TAG: "${MAJOR}-1_${CI_COMMIT_REF_SLUG}-stable" @@ -118,9 +123,9 @@ 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 - | if [ -z "$DOTENV" ]; then + docker pull $SOURCE_IMAGE docker tag $SOURCE_IMAGE $TARGET_IMAGE else ./bin/docker-dotenv -- cgit v1.2.3 From 17925120921f7f1c08409747038bebbae954680f Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 16:55:17 -0600 Subject: move test release jobs to test stage --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50b625c..4e48abb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,6 +51,7 @@ container_scanning: .QA:test-release: extends: .release + stage: test variables: DOTENV: '.env.legacy' IMAGE_TAG: "${MAJOR}-${CI_COMMIT_REF_SLUG}-stable" -- cgit v1.2.3 From 4e0df3ca8309cde85b99da1c2c81c31bbf88d1aa Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 17:37:01 -0600 Subject: bring back IMAGE_TAG --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e48abb..9b0843c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,6 +75,7 @@ container_scanning: - export IMAGE_TAG="${MAJOR}-2_${CI_COMMIT_REF_SLUG}-stable" variables: DOTENV: ".env.12-2-stable" + IMAGE_TAG: "${MAJOR}-2_${CI_COMMIT_REF_SLUG}-stable" 12-1-test-release: extends: .QA:test-release -- cgit v1.2.3 From 81892a844a085318cce9a138f87c08f39197869f Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 17:41:29 -0600 Subject: remove before_script because it did not work --- .gitlab-ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b0843c..020c4c2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,24 +63,18 @@ container_scanning: 12-3-test-release: extends: .QA:test-release - before_script: - - export IMAGE_TAG="${MAJOR}-3_${CI_COMMIT_REF_SLUG}-stable" variables: DOTENV: ".env.12-3-stable" IMAGE_TAG: "${MAJOR}-3_${CI_COMMIT_REF_SLUG}-stable" 12-2-test-release: extends: .QA:test-release - before_script: - - export IMAGE_TAG="${MAJOR}-2_${CI_COMMIT_REF_SLUG}-stable" variables: DOTENV: ".env.12-2-stable" IMAGE_TAG: "${MAJOR}-2_${CI_COMMIT_REF_SLUG}-stable" 12-1-test-release: extends: .QA:test-release - before_script: - - export IMAGE_TAG="${MAJOR}-1_${CI_COMMIT_REF_SLUG}-stable" variables: DOTENV: ".env.legacy" IMAGE_TAG: "${MAJOR}-1_${CI_COMMIT_REF_SLUG}-stable" -- cgit v1.2.3 From 48ae3ea11b93dfd028920e0615f1287389203d38 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 17:43:40 -0600 Subject: debug docker_tag --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 020c4c2..d17c8c0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,7 +50,7 @@ container_scanning: when: always .QA:test-release: - extends: .release + extends: .docker_tag stage: test variables: DOTENV: '.env.legacy' @@ -118,7 +118,10 @@ QA:go: - docker info - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - export SOURCE_IMAGE=$TMP_IMAGE + - echo $IMAGE_TAG + - echo $CI_JOB_NAME - export TARGET_IMAGE=$CI_REGISTRY_IMAGE:${IMAGE_TAG:-$CI_JOB_NAME} + - echo $TARGET_IMAGE - | if [ -z "$DOTENV" ]; then docker pull $SOURCE_IMAGE -- cgit v1.2.3 From c86eff31aea8315f437b15ffbfff513c12760c28 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 22 Aug 2019 17:55:49 -0600 Subject: enable tracing --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d17c8c0..7ce4cd4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,7 @@ variables: DOCKER_DRIVER: overlay2 MAJOR: 1 TMP_IMAGE: $CI_REGISTRY_IMAGE/tmp:$CI_COMMIT_SHA + CI_DEBUG_TRACE: "true" include: - template: Container-Scanning.gitlab-ci.yml -- cgit v1.2.3 From 6c2fcaa1def6f77611db3a0859208ed3aaf98883 Mon Sep 17 00:00:00 2001 From: mo khan Date: Fri, 23 Aug 2019 10:31:54 -0600 Subject: use CI_COMMIT_SHA instead of the CI_COMMIT_REF_SLUG --- .gitlab-ci.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ce4cd4..5fc013b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,7 +55,7 @@ container_scanning: stage: test variables: DOTENV: '.env.legacy' - IMAGE_TAG: "${MAJOR}-${CI_COMMIT_REF_SLUG}-stable" + IMAGE_TAG: "${MAJOR}-${CI_COMMIT_SHA}-stable" only: - branches except: @@ -66,19 +66,19 @@ container_scanning: extends: .QA:test-release variables: DOTENV: ".env.12-3-stable" - IMAGE_TAG: "${MAJOR}-3_${CI_COMMIT_REF_SLUG}-stable" + IMAGE_TAG: "${MAJOR}-3_${CI_COMMIT_SHA}-stable" 12-2-test-release: extends: .QA:test-release variables: DOTENV: ".env.12-2-stable" - IMAGE_TAG: "${MAJOR}-2_${CI_COMMIT_REF_SLUG}-stable" + IMAGE_TAG: "${MAJOR}-2_${CI_COMMIT_SHA}-stable" 12-1-test-release: extends: .QA:test-release variables: DOTENV: ".env.legacy" - IMAGE_TAG: "${MAJOR}-1_${CI_COMMIT_REF_SLUG}-stable" + IMAGE_TAG: "${MAJOR}-1_${CI_COMMIT_SHA}-stable" QA:java-maven: extends: .QA @@ -119,10 +119,7 @@ QA:go: - docker info - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - export SOURCE_IMAGE=$TMP_IMAGE - - echo $IMAGE_TAG - - echo $CI_JOB_NAME - export TARGET_IMAGE=$CI_REGISTRY_IMAGE:${IMAGE_TAG:-$CI_JOB_NAME} - - echo $TARGET_IMAGE - | if [ -z "$DOTENV" ]; then docker pull $SOURCE_IMAGE -- cgit v1.2.3 From 0d2e9e06363c7ac3fb730e153662804d5b4d6d0d Mon Sep 17 00:00:00 2001 From: mo khan Date: Fri, 23 Aug 2019 10:49:23 -0600 Subject: use the SHORT_SHA instead of the full SHA --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5fc013b..fb9ed7a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,7 +55,7 @@ container_scanning: stage: test variables: DOTENV: '.env.legacy' - IMAGE_TAG: "${MAJOR}-${CI_COMMIT_SHA}-stable" + IMAGE_TAG: "${MAJOR}-${CI_COMMIT_SHORT_SHA}-stable" only: - branches except: @@ -66,19 +66,19 @@ container_scanning: extends: .QA:test-release variables: DOTENV: ".env.12-3-stable" - IMAGE_TAG: "${MAJOR}-3_${CI_COMMIT_SHA}-stable" + IMAGE_TAG: "${MAJOR}-3_${CI_COMMIT_SHORT_SHA}-stable" 12-2-test-release: extends: .QA:test-release variables: DOTENV: ".env.12-2-stable" - IMAGE_TAG: "${MAJOR}-2_${CI_COMMIT_SHA}-stable" + IMAGE_TAG: "${MAJOR}-2_${CI_COMMIT_SHORT_SHA}-stable" 12-1-test-release: extends: .QA:test-release variables: DOTENV: ".env.legacy" - IMAGE_TAG: "${MAJOR}-1_${CI_COMMIT_SHA}-stable" + IMAGE_TAG: "${MAJOR}-1_${CI_COMMIT_SHORT_SHA}-stable" QA:java-maven: extends: .QA -- cgit v1.2.3 From 414ca87abf584c0af59bc9d8ece731424fdd4402 Mon Sep 17 00:00:00 2001 From: mo khan Date: Fri, 23 Aug 2019 11:04:58 -0600 Subject: remove CI_DEBUG_TRACE --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb9ed7a..6308d31 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ variables: DOCKER_DRIVER: overlay2 MAJOR: 1 TMP_IMAGE: $CI_REGISTRY_IMAGE/tmp:$CI_COMMIT_SHA - CI_DEBUG_TRACE: "true" include: - template: Container-Scanning.gitlab-ci.yml -- cgit v1.2.3 From b24fbeedb5c1357ea354f19bb21eec7fe36229d9 Mon Sep 17 00:00:00 2001 From: mo khan Date: Fri, 23 Aug 2019 11:33:53 -0600 Subject: MAJOR does not match gitlab self managed major version --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6308d31..29ca583 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,7 +54,7 @@ container_scanning: stage: test variables: DOTENV: '.env.legacy' - IMAGE_TAG: "${MAJOR}-${CI_COMMIT_SHORT_SHA}-stable" + IMAGE_TAG: "12-${CI_COMMIT_SHORT_SHA}-stable" only: - branches except: @@ -65,19 +65,19 @@ container_scanning: extends: .QA:test-release variables: DOTENV: ".env.12-3-stable" - IMAGE_TAG: "${MAJOR}-3_${CI_COMMIT_SHORT_SHA}-stable" + IMAGE_TAG: "12-3_${CI_COMMIT_SHORT_SHA}-stable" 12-2-test-release: extends: .QA:test-release variables: DOTENV: ".env.12-2-stable" - IMAGE_TAG: "${MAJOR}-2_${CI_COMMIT_SHORT_SHA}-stable" + IMAGE_TAG: "12-2_${CI_COMMIT_SHORT_SHA}-stable" 12-1-test-release: extends: .QA:test-release variables: DOTENV: ".env.legacy" - IMAGE_TAG: "${MAJOR}-1_${CI_COMMIT_SHORT_SHA}-stable" + IMAGE_TAG: "12-1_${CI_COMMIT_SHORT_SHA}-stable" QA:java-maven: extends: .QA -- cgit v1.2.3 From 7bd94b66e1aa2cae59d587847c501e007a0c50af Mon Sep 17 00:00:00 2001 From: mo khan Date: Mon, 26 Aug 2019 12:57:04 -0600 Subject: remove test jobs --- .gitlab-ci.yml | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 29ca583..e157f53 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,36 +49,6 @@ container_scanning: - results/ when: always -.QA:test-release: - extends: .docker_tag - stage: test - variables: - DOTENV: '.env.legacy' - IMAGE_TAG: "12-${CI_COMMIT_SHORT_SHA}-stable" - only: - - branches - except: - - master - when: manual - -12-3-test-release: - extends: .QA:test-release - variables: - DOTENV: ".env.12-3-stable" - IMAGE_TAG: "12-3_${CI_COMMIT_SHORT_SHA}-stable" - -12-2-test-release: - extends: .QA:test-release - variables: - DOTENV: ".env.12-2-stable" - IMAGE_TAG: "12-2_${CI_COMMIT_SHORT_SHA}-stable" - -12-1-test-release: - extends: .QA:test-release - variables: - DOTENV: ".env.legacy" - IMAGE_TAG: "12-1_${CI_COMMIT_SHORT_SHA}-stable" - QA:java-maven: extends: .QA variables: -- cgit v1.2.3