From bcf370bc682f76929c89c8efbe266f148c5733e3 Mon Sep 17 00:00:00 2001 From: mo khan Date: Tue, 23 Jun 2020 10:59:39 -0600 Subject: export TARGET_IMAGE before pushing to new repo --- .gitlab/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/deploy.yml b/.gitlab/deploy.yml index c32149d..824d894 100644 --- a/.gitlab/deploy.yml +++ b/.gitlab/deploy.yml @@ -43,6 +43,7 @@ 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 + - export TARGET_IMAGE=$CI_REGISTRY_IMAGE:${IMAGE_TAG:-$CI_JOB_NAME} - 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} -- cgit v1.2.3 From 3c1bbfd222b8e7874e2abe272c5833482d803888 Mon Sep 17 00:00:00 2001 From: mo khan Date: Tue, 23 Jun 2020 11:03:11 -0600 Subject: Bump version and add CHANGELOG entry --- CHANGELOG.md | 4 ++++ Gemfile.lock | 2 +- lib/license/management/version.rb | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c019ad4..9b3a1a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # GitLab License management changelog +## v3.12.2 + +- Publish latest major version to registry.gitlab.com/gitlab-org/security-products/analyzers/license-finder:3 (!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/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 -- cgit v1.2.3 From 8055c465812ab8a7c0c52fd3c46bcbc52effcff3 Mon Sep 17 00:00:00 2001 From: mo khan Date: Tue, 23 Jun 2020 11:35:56 -0600 Subject: Extract DESTINATION_IMAGE variable --- .gitlab/deploy.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab/deploy.yml b/.gitlab/deploy.yml index 824d894..beaa1fd 100644 --- a/.gitlab/deploy.yml +++ b/.gitlab/deploy.yml @@ -44,8 +44,9 @@ version: # Also push to registry.gitlab.com/gitlab-org/security-products/analyzers/license-finder - docker login -u gitlab-ci-token -p $GITLAB_TOKEN $CI_REGISTRY - export TARGET_IMAGE=$CI_REGISTRY_IMAGE:${IMAGE_TAG:-$CI_JOB_NAME} - - 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 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 -- cgit v1.2.3 From 9a70954ce6b6d4ce9c7867595a0b9bcb25484c5d Mon Sep 17 00:00:00 2001 From: mo khan Date: Tue, 23 Jun 2020 15:03:52 -0600 Subject: Print gem version in log output --- CHANGELOG.md | 1 + lib/license/management.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b3a1a2..0335c7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## 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 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 -- cgit v1.2.3