Merge pull request #571 from acelaya-forks/bugfix/docker-version

Bugfix/docker version
This commit is contained in:
Alejandro Celaya authored and GitHub committed 2019-12-09 18:31:08 +01:00
commit c1741c99be
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -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
+1 -1
View File
@@ -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#?}