OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-09 23:15:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Bugfix/docker version
This commit is contained in:
Alejandro Celaya 2019-12-09 18:31:08 +01:00 committed by GitHub
commit c1741c99be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
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

2
hooks/build
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#?}