Merge branch 'cleanup' into 'master'

Remove unused config files and jobs

See merge request gitlab-org/security-products/license-management!223

13 files changed, 3 insertions, 186 deletions

diff --git a/.gitlab/deploy.yml b/.gitlab/deploy.yml
index 78c357a..f4f706d 100644
--- a/.gitlab/deploy.yml
+++ b/.gitlab/deploy.yml
@@ -10,12 +10,8 @@
     - export SOURCE_IMAGE=$TMP_IMAGE
     - export TARGET_IMAGE=$CI_REGISTRY_IMAGE:${IMAGE_TAG:-$CI_JOB_NAME}
     - |
-      if [ -z "$DOTENV" ]; then
-        docker pull $SOURCE_IMAGE
-        docker tag $SOURCE_IMAGE $TARGET_IMAGE
-      else
-        ./bin/docker-dotenv
-      fi
+      docker pull $SOURCE_IMAGE
+      docker tag $SOURCE_IMAGE $TARGET_IMAGE
     - docker push $TARGET_IMAGE
 
 latest:
@@ -35,7 +31,7 @@ version:
     - if: $CI_COMMIT_TAG
   allow_failure: false
 
-.release:
+major:
   extends: .docker_tag
   rules:
     - if: $CI_COMMIT_TAG
@@ -47,128 +43,5 @@ version:
     - export DESTINATION_IMAGE=registry.gitlab.com/gitlab-org/security-products/analyzers/license-finder:${IMAGE_TAG:-$CI_JOB_NAME}
     - docker tag $TARGET_IMAGE $DESTINATION_IMAGE
     - docker push $DESTINATION_IMAGE
-
-major:
-  extends: .release
   variables:
     IMAGE_TAG: $MAJOR
-
-13-0-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.13-0-stable"
-
-12-10-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.12-10-stable"
-
-12-9-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.12-9-stable"
-
-12-8-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.12-8-stable"
-
-12-7-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.12-7-stable"
-
-12-6-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.12-6-stable"
-
-12-5-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.12-5-stable"
-
-12-4-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.12-4-stable"
-
-12-3-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.12-3-stable"
-
-12-2-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.12-2-stable"
-
-12-1-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-12-0-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-11-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-10-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-9-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-8-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-7-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-6-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-5-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-4-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-3-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-2-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-1-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
-
-11-0-stable:
-  extends: .release
-  variables:
-    DOTENV: "config/files/.env.legacy"
diff --git a/bin/docker-dotenv b/bin/docker-dotenv
deleted file mode 100755
index fb40a99..0000000
--- a/bin/docker-dotenv
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/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
diff --git a/config/files/.env.12-10-stable b/config/files/.env.12-10-stable
deleted file mode 100644
index da5a244..0000000
--- a/config/files/.env.12-10-stable
+++ /dev/null
@@ -1,2 +0,0 @@
-LM_REPORT_FILE gl-license-management-report.json
-LM_REPORT_VERSION '2.0'
diff --git a/config/files/.env.12-2-stable b/config/files/.env.12-2-stable
deleted file mode 100644
index 808b2ac..0000000
--- a/config/files/.env.12-2-stable
+++ /dev/null
@@ -1,2 +0,0 @@
-LM_REPORT_FILE gl-license-management-report.json
-LM_REPORT_VERSION 1
diff --git a/config/files/.env.12-3-stable b/config/files/.env.12-3-stable
deleted file mode 100644
index 808b2ac..0000000
--- a/config/files/.env.12-3-stable
+++ /dev/null
@@ -1,2 +0,0 @@
-LM_REPORT_FILE gl-license-management-report.json
-LM_REPORT_VERSION 1
diff --git a/config/files/.env.12-4-stable b/config/files/.env.12-4-stable
deleted file mode 100644
index 86a9c8f..0000000
--- a/config/files/.env.12-4-stable
+++ /dev/null
@@ -1,2 +0,0 @@
-LM_REPORT_FILE gl-license-management-report.json
-LM_REPORT_VERSION '1.1'
diff --git a/config/files/.env.12-5-stable b/config/files/.env.12-5-stable
deleted file mode 100644
index da5a244..0000000
--- a/config/files/.env.12-5-stable
+++ /dev/null
@@ -1,2 +0,0 @@
-LM_REPORT_FILE gl-license-management-report.json
-LM_REPORT_VERSION '2.0'
diff --git a/config/files/.env.12-6-stable b/config/files/.env.12-6-stable
deleted file mode 100644
index da5a244..0000000
--- a/config/files/.env.12-6-stable
+++ /dev/null
@@ -1,2 +0,0 @@
-LM_REPORT_FILE gl-license-management-report.json
-LM_REPORT_VERSION '2.0'
diff --git a/config/files/.env.12-7-stable b/config/files/.env.12-7-stable
deleted file mode 100644
index da5a244..0000000
--- a/config/files/.env.12-7-stable
+++ /dev/null
@@ -1,2 +0,0 @@
-LM_REPORT_FILE gl-license-management-report.json
-LM_REPORT_VERSION '2.0'
diff --git a/config/files/.env.12-8-stable b/config/files/.env.12-8-stable
deleted file mode 100644
index da5a244..0000000
--- a/config/files/.env.12-8-stable
+++ /dev/null
@@ -1,2 +0,0 @@
-LM_REPORT_FILE gl-license-management-report.json
-LM_REPORT_VERSION '2.0'
diff --git a/config/files/.env.12-9-stable b/config/files/.env.12-9-stable
deleted file mode 100644
index da5a244..0000000
--- a/config/files/.env.12-9-stable
+++ /dev/null
@@ -1,2 +0,0 @@
-LM_REPORT_FILE gl-license-management-report.json
-LM_REPORT_VERSION '2.0'
diff --git a/config/files/.env.13-0-stable b/config/files/.env.13-0-stable
deleted file mode 100644
index da5a244..0000000
--- a/config/files/.env.13-0-stable
+++ /dev/null
@@ -1,2 +0,0 @@
-LM_REPORT_FILE gl-license-management-report.json
-LM_REPORT_VERSION '2.0'
diff --git a/config/files/.env.legacy b/config/files/.env.legacy
deleted file mode 100644
index 7181ab8..0000000
--- a/config/files/.env.legacy
+++ /dev/null
@@ -1,3 +0,0 @@
-LM_PYTHON_VERSION 2.7
-LM_REPORT_FILE gl-license-management-report.json
-LM_REPORT_VERSION 1