Merge branch 'export-target-image' into 'master'v3.12.2

Publish latest major version to gitlab-org/security-products/analyers/license-finder

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

5 files changed, 12 insertions, 5 deletions

diff --git a/.gitlab/deploy.yml b/.gitlab/deploy.yml
index c32149d..beaa1fd 100644
--- a/.gitlab/deploy.yml
+++ b/.gitlab/deploy.yml
@@ -43,8 +43,10 @@ version:
   after_script:
     # Also push to registry.gitlab.com/gitlab-org/security-products/analyzers/license-finder
     - docker login -u gitlab-ci-token -p $GITLAB_TOKEN $CI_REGISTRY
-    - docker tag $TARGET_IMAGE registry.gitlab.com/gitlab-org/security-products/analyzers/license-finder:${IMAGE_TAG:-$CI_JOB_NAME}
-    - docker push registry.gitlab.com/gitlab-org/security-products/analyzers/license-finder:${IMAGE_TAG:-$CI_JOB_NAME}
+    - export TARGET_IMAGE=$CI_REGISTRY_IMAGE:${IMAGE_TAG:-$CI_JOB_NAME}
+    - 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
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c019ad4..0335c7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # GitLab License management changelog
 
+## v3.12.2
+
+- Publish latest major version to registry.gitlab.com/gitlab-org/security-products/analyzers/license-finder:3 (!175)
+- Print version of license in log output. (!175)
+
 ## v3.12.1
 
 - Detect variations of the "Eclipse Public License" (!174)
diff --git a/Gemfile.lock b/Gemfile.lock
index 8c23a6a..a108672 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    license-management (3.12.1)
+    license-management (3.12.2)
       license_finder (~> 6.0.0)
 
 GEM
diff --git a/lib/license/management.rb b/lib/license/management.rb
index 3b8cb69..8ba2992 100644
--- a/lib/license/management.rb
+++ b/lib/license/management.rb
@@ -25,7 +25,7 @@ module License
     def self.logger
       @logger ||= Logger.new(STDOUT, level: ENV.fetch('LOG_LEVEL', Logger::WARN)).tap do |x|
         x.formatter = proc do |_severity, _datetime, _progname, message|
-          "#{message}\n"
+          "[v#{VERSION}] #{message}\n"
         end
       end
     end
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index 163e48d..f8376f4 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
 
 module License
   module Management
-    VERSION = '3.12.1'
+    VERSION = '3.12.2'
   end
 end