luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Docker: Pull prod base images before building preview and release

Browse source
This commit is contained in:
Michael Mayer 2022-02-16 16:24:45 +01:00
parent c5fb647d96
commit 39fb3b7ab0
2 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Makefile
View file

@ -222,40 +222,56 @@ docker-preview: docker-preview-bullseye docker-preview-buster docker-preview-imp
docker-preview-bullseye:
docker pull --platform=amd64 photoprism/develop:bullseye
docker pull --platform=arm64 photoprism/develop:bullseye
docker pull --platform=amd64 debian:bullseye-slim
docker pull --platform=arm64 debian:bullseye-slim
scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 preview /bullseye
docker-preview-arm64:
docker pull --platform=arm64 photoprism/develop:bullseye
docker pull --platform=arm64 debian:bullseye-slim
scripts/docker/buildx.sh photoprism linux/arm64 preview-arm64 /bullseye
docker-preview-armv7:
docker pull --platform=arm photoprism/develop:armv7
docker pull --platform=arm debian:bullseye-slim
scripts/docker/buildx.sh photoprism linux/arm preview-armv7 /armv7
docker-preview-buster:
docker pull --platform=amd64 photoprism/develop:buster
docker pull --platform=arm64 photoprism/develop:buster
docker pull --platform=amd64 debian:buster-slim
docker pull --platform=arm64 debian:buster-slim
scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 preview-buster /buster
docker-preview-impish:
docker pull --platform=amd64 photoprism/develop:latest
docker pull --platform=arm64 photoprism/develop:latest
docker pull --platform=amd64 ubuntu:impish
docker pull --platform=arm64 ubuntu:impish
scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 preview-impish /impish
docker-preview-arm64:
docker pull --platform=arm64 photoprism/develop:bullseye
scripts/docker/buildx.sh photoprism linux/arm64 preview-arm64 /bullseye
docker-preview-armv7:
docker pull --platform=arm photoprism/develop:armv7
scripts/docker/buildx.sh photoprism linux/arm preview-armv7 /armv7
docker-release: docker-release-bullseye docker-release-buster docker-release-impish
docker-release-bullseye:
docker pull --platform=amd64 photoprism/develop:bullseye
docker pull --platform=arm64 photoprism/develop:bullseye
docker pull --platform=amd64 debian:bullseye-slim
docker pull --platform=arm64 debian:bullseye-slim
scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 bullseye /bullseye "-t photoprism/photoprism:latest"
docker-release-arm64:
docker pull --platform=arm64 photoprism/develop:bullseye
docker pull --platform=arm64 debian:bullseye-slim
scripts/docker/buildx.sh photoprism linux/arm64 arm64 /bullseye
docker-release-armv7:
docker pull --platform=arm photoprism/develop:armv7
docker pull --platform=arm debian:bullseye-slim
scripts/docker/buildx.sh photoprism linux/arm armv7 /armv7
docker-release-buster:
docker pull --platform=amd64 photoprism/develop:buster
docker pull --platform=arm64 photoprism/develop:buster
docker pull --platform=amd64 debian:buster-slim
docker pull --platform=arm64 debian:buster-slim
scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 buster /buster
docker-release-impish:
docker pull --platform=amd64 photoprism/develop:impish
docker pull --platform=arm64 photoprism/develop:impish
docker pull --platform=amd64 ubuntu:impish
docker pull --platform=arm64 ubuntu:impish
scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 impish /impish
docker-release-arm64:
docker pull --platform=arm64 photoprism/develop:bullseye
scripts/docker/buildx.sh photoprism linux/arm64 arm64 /bullseye
docker-release-armv7:
docker pull --platform=arm photoprism/develop:armv7
scripts/docker/buildx.sh photoprism linux/arm armv7 /armv7
docker-local:
scripts/docker/build.sh photoprism
docker-pull:

8
scripts/docker/build.sh
View file

@ -17,8 +17,8 @@ DOCKER_TAG=$(date -u +%Y%m%d)
if [[ $1 ]] && [[ -z $2 || $2 == "preview" ]]; then
echo "docker/build: building photoprism/$1:preview from docker/${1/-//}$3/Dockerfile...";
docker build \
--no-cache \
--pull \
--no-cache \
--build-arg BUILD_TAG=$DOCKER_TAG \
--build-arg GOPROXY \
--build-arg GODEBUG \
@ -32,8 +32,8 @@ elif [[ $2 =~ $NUMERIC ]]; then
fi
docker build $4\
--no-cache \
--pull \
--no-cache \
--build-arg BUILD_TAG=$2 \
--build-arg GOPROXY \
--build-arg GODEBUG \
@ -48,8 +48,8 @@ elif [[ $2 == *"preview"* ]]; then
fi
docker build $4\
--no-cache \
--pull \
--no-cache \
--build-arg BUILD_TAG=$DOCKER_TAG \
--build-arg GOPROXY \
--build-arg GODEBUG \
@ -63,8 +63,8 @@ else
fi
docker build $4\
--no-cache \
--pull \
--no-cache \
--build-arg BUILD_TAG=$DOCKER_TAG \
--build-arg GOPROXY \
--build-arg GODEBUG \