From cd9fd2fb45dc8a84b998d19d78bbf8dca0437cd0 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Wed, 28 Sep 2022 12:15:29 +0200 Subject: [PATCH] Docker: Add "unstable" build target to Makefile Signed-off-by: Michael Mayer --- Makefile | 6 ++++++ scripts/docker/build.sh | 2 +- scripts/docker/buildx-multi.sh | 2 +- scripts/docker/buildx.sh | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e48954ba2..960be935b 100644 --- a/Makefile +++ b/Makefile @@ -321,6 +321,12 @@ docker-develop-jammy-slim: docker pull --platform=amd64 ubuntu:jammy docker pull --platform=arm64 ubuntu:jammy scripts/docker/buildx-multi.sh develop linux/amd64,linux/arm64 jammy-slim /jammy-slim +unstable: docker-unstable +docker-unstable: docker-unstable-jammy +docker-unstable-jammy: + docker pull --platform=amd64 photoprism/develop:jammy + docker pull --platform=amd64 photoprism/develop:jammy-slim + scripts/docker/buildx-multi.sh photoprism linux/amd64 unstable /jammy preview: docker-preview docker-preview: docker-preview-latest docker-preview-all: docker-preview-latest docker-preview-other diff --git a/scripts/docker/build.sh b/scripts/docker/build.sh index 6f7247ec7..0369cda60 100755 --- a/scripts/docker/build.sh +++ b/scripts/docker/build.sh @@ -40,7 +40,7 @@ elif [[ $2 =~ $NUMERIC ]]; then -t photoprism/$1:latest \ -t photoprism/$1:$2 \ -f docker/${1/-//}$3/Dockerfile . -elif [[ $2 == *"preview"* ]]; then +elif [[ $2 == *"preview"* || $2 == *"unstable"* || $2 == *"test"* || $2 == *"local"* || $2 == *"develop"* ]]; then echo "Build Tags: $2" if [[ $4 ]]; then diff --git a/scripts/docker/buildx-multi.sh b/scripts/docker/buildx-multi.sh index 289b29731..67081a51c 100755 --- a/scripts/docker/buildx-multi.sh +++ b/scripts/docker/buildx-multi.sh @@ -55,7 +55,7 @@ elif [[ $3 =~ $NUMERIC ]]; then -t photoprism/$1:latest \ -t photoprism/$1:$3 $5 \ --push . -elif [[ $4 ]] && [[ $3 == *"preview"* ]]; then +elif [[ $4 ]] && [[ $3 == *"preview"* || $3 == *"unstable"* || $3 == *"test"* ]]; then echo "Build Tags: $3" if [[ $5 ]]; then diff --git a/scripts/docker/buildx.sh b/scripts/docker/buildx.sh index 9f1dcbc3d..73e0ff41f 100755 --- a/scripts/docker/buildx.sh +++ b/scripts/docker/buildx.sh @@ -45,7 +45,7 @@ elif [[ $3 =~ $NUMERIC ]]; then -t photoprism/$1:latest \ -t photoprism/$1:$3 $5 \ --push . -elif [[ $4 ]] && [[ $3 == *"preview"* ]]; then +elif [[ $4 ]] && [[ $3 == *"preview"* || $3 == *"unstable"* || $3 == *"test"* ]]; then echo "Build Tags: $3" if [[ $5 ]]; then