diff --git a/CHANGELOG.md b/CHANGELOG.md index 21dde341..2ee9cc37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this * *Nothing* ### Fixed -* [#1041](https://github.com/shlinkio/shlink/issues/1041) Added missing `--build-arg SHLINK_VERSION=latest` when building latest docker image. +* [#1041](https://github.com/shlinkio/shlink/issues/1041) Ensured the default value for the version while building the docker image is `latest`. ## [2.6.1] - 2021-02-22 diff --git a/Dockerfile b/Dockerfile index eb458bf1..c058ef61 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.0.2-alpine3.13 as base -ARG SHLINK_VERSION=2.6.1 +ARG SHLINK_VERSION=latest ENV SHLINK_VERSION ${SHLINK_VERSION} ENV SWOOLE_VERSION 4.6.3 ENV PDO_SQLSRV_VERSION 5.9.0 diff --git a/docker/build b/docker/build index 8e8db6c3..fdd58106 100755 --- a/docker/build +++ b/docker/build @@ -20,7 +20,6 @@ if [[ "$GITHUB_REF" != *"develop"* ]]; then # If build branch is develop, build latest elif [[ "$GITHUB_REF" == *"develop"* ]]; then docker buildx build --push \ - --build-arg SHLINK_VERSION=latest \ --platform ${PLATFORMS} \ -t ${DOCKER_IMAGE}:latest . fi