From 8128e85b6be75fce501e4fb7219b3bd968d627f0 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Mon, 1 Mar 2021 17:04:16 +0100
Subject: [PATCH] Ensured latest docker image is built with
 SHLINK_VERSION=latest

---
 CHANGELOG.md | 2 +-
 Dockerfile   | 2 +-
 docker/build | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8dce72c..21dde341 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
-* *Nothing*
+* [#1041](https://github.com/shlinkio/shlink/issues/1041) Added missing `--build-arg SHLINK_VERSION=latest` when building latest docker image.
 
 
 ## [2.6.1] - 2021-02-22
diff --git a/Dockerfile b/Dockerfile
index fd703ebc..eb458bf1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM php:8.0.2-alpine3.13 as base
 
-ARG SHLINK_VERSION=2.5.2
+ARG SHLINK_VERSION=2.6.1
 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 fdd58106..8e8db6c3 100755
--- a/docker/build
+++ b/docker/build
@@ -20,6 +20,7 @@ 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