From 8799e669cc709181f2162b0c7a8b6e68f39e6693 Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Wed, 16 Oct 2019 15:16:05 -0600
Subject: Add documentation on how to release new versions

---
 README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/README.md b/README.md
index 8712ad5..ec7918f 100644
--- a/README.md
+++ b/README.md
@@ -106,6 +106,23 @@ to the docker command.
 
 ## Versioning and release process
 
+1. Create a new entry in the `.gitlab-ci.yml` file for the new version to release.
+
+    ```yaml
+    12-x-stable:
+      extends: .release
+      variables:
+        DOTENV: ".env.12-x-stable"
+    ```
+
+2. Create a new `.env.*` that corresponds to the version to release and specify the default configuration.
+
+    ```text
+    FEATURE_RUBY_REPORT 'true'
+    LM_REPORT_VERSION '2.0'
+    LM_V1_CANONICALIZE 'true'
+    ```
+
 Please check the [Release Process documentation](https://gitlab.com/gitlab-org/security-products/release/blob/master/docs/release_process.md).
 
 # Contributing
-- 
cgit v1.2.3


From 69f06c4065af94e725d7352ca8a4cb645e0a27ab Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Wed, 16 Oct 2019 15:21:40 -0600
Subject: Add entry specifically for controlling the python version

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index ec7918f..c1870e4 100644
--- a/README.md
+++ b/README.md
@@ -119,6 +119,7 @@ to the docker command.
 
     ```text
     FEATURE_RUBY_REPORT 'true'
+    LM_PYTHON_VERSION '3.5'
     LM_REPORT_VERSION '2.0'
     LM_V1_CANONICALIZE 'true'
     ```
-- 
cgit v1.2.3


From 4c16c21d0dbee59da43479a59415fa126d25b4bf Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Wed, 16 Oct 2019 15:22:19 -0600
Subject: Remove dead code

---
 .gitlab-ci.yml | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b175ee..d998e7d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -195,20 +195,6 @@ QA:js-v2:
       fi
     - docker push $TARGET_IMAGE
 
-.docker_tag_python2:
-  image: docker:stable
-  stage: tag
-  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}
-    - docker pull $SOURCE_IMAGE
-    - echo "FROM $SOURCE_IMAGE" > Dockerfile.python2
-    - echo "ENV LM_PYTHON_VERSION 2.7" >> Dockerfile.python2
-    - docker build -t $TARGET_IMAGE -f Dockerfile.python2 .
-    - docker push $TARGET_IMAGE
-
 branch:
   extends: .docker_tag
   variables:
@@ -236,17 +222,6 @@ version:
   when: manual
   allow_failure: false
 
-version python2:
-  extends: .docker_tag_python2
-  before_script:
-    - export IMAGE_TAG=${CI_COMMIT_TAG/v/}-python2
-    - echo "Checking that $CI_COMMIT_TAG is last in the changelog"
-    - test "$(grep '^## v' CHANGELOG.md |head -n 1)" = "## $CI_COMMIT_TAG"
-  only:
-    - tags
-  when: manual
-  allow_failure: false
-
 .release:
   extends: .docker_tag
   stage: release
-- 
cgit v1.2.3