From 108e2cad4af6cd43fba40324a42dfb9591a3b546 Mon Sep 17 00:00:00 2001 From: Tetiana Chupryna Date: Tue, 5 Mar 2019 17:34:13 +0000 Subject: Use only one version everywhere --- CHANGELOG.md | 4 ++++ Dockerfile | 7 ++++++- run.sh | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93d0dcb..65acbc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # GitLab License management changelog +## v1.2.2 + +- Bump LicenseFinder to 5.6.2 + ## v1.2.1 - Better support for js npm projects (!14) diff --git a/Dockerfile b/Dockerfile index c2f6c33..f21e9e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,11 @@ -FROM licensefinder/license_finder:5.5.2 +ARG LICENSE_FINDER_VERSION=5.6.2 + +FROM licensefinder/license_finder:$LICENSE_FINDER_VERSION MAINTAINER GitLab +ARG LICENSE_FINDER_VERSION +ENV LICENSE_FINDER_VERSION $LICENSE_FINDER_VERSION + RUN npm install npm-install-peers cheerio # Don't let Rubygem fail with the numerous projects using PG or MySQL, install realpath diff --git a/run.sh b/run.sh index 45fb3ab..aad51a5 100755 --- a/run.sh +++ b/run.sh @@ -94,7 +94,7 @@ case "$COMMAND" in rvm use . gem install bundler # We need to install the license_finder gem into this Ruby version too. - gem install license_finder + gem install license_finder -v "$LICENSE_FINDER_VERSION" fi # Ignore test and development dependencies. -- cgit v1.2.3