From 83b9160ab11898870b83774c008fde1a0bcb188a Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Mon, 9 Dec 2019 18:16:57 +0100 Subject: [PATCH 1/2] Updated docker image build script so that it sets shlink version to 'latest' when source branch is develop --- hooks/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/build b/hooks/build index d7d39368..6b381d74 100755 --- a/hooks/build +++ b/hooks/build @@ -1,7 +1,7 @@ #!/bin/bash set -ex -if [[ ${SOURCE_BRANCH} == 'master' ]]; then +if [[ ${SOURCE_BRANCH} == 'develop' ]]; then SHLINK_RELEASE='latest' else SHLINK_RELEASE=${SOURCE_BRANCH#?} From a03179743de4354647655498446171d74fc1cb29 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Mon, 9 Dec 2019 18:18:03 +0100 Subject: [PATCH 2/2] Updated changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07ea782b..c6fc5f19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,7 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this #### Fixed -* *Nothing* +* [#570](https://github.com/shlinkio/shlink/issues/570) Fixed shlink version generated for docker images when building from `develop` branch. ## 1.20.2 - 2019-12-06