johanels/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-12-12 00:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Docker: Reorganize image folders and update build scripts

Browse Source
This commit is contained in:
Michael Mayer
2022-02-16 14:29:42 +01:00
parent 0a696f8d49
commit 823f864896
9 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/docker/build.sh
View File

@@ -14,8 +14,8 @@ NUMERIC='^[0-9]+$'
GOPROXY=${GOPROXY:-'https://proxy.golang.org,direct'}
DOCKER_TAG=$(date -u +%Y%m%d)
if [[ $1 ]] && [[ -z $2 ]]; then
echo "docker/build: building photoprism/$1:preview...";
if [[ $1 ]] && [[ -z $2 || $2 == "preview" ]]; then
echo "docker/build: building photoprism/$1:preview from docker/${1/-//}$3/Dockerfile...";
docker build \
--no-cache \
--pull \
@@ -23,9 +23,9 @@ if [[ $1 ]] && [[ -z $2 ]]; then
--build-arg GOPROXY \
--build-arg GODEBUG \
-t photoprism/$1:preview \
-f docker/${1/-//}/Dockerfile .
-f docker/${1/-//}$3/Dockerfile .
elif [[ $2 =~ $NUMERIC ]]; then
echo "docker/build: building photoprism/$1:$2,$1:latest...";
echo "docker/build: building photoprism/$1:$2,$1:latest from docker/${1/-//}$3/Dockerfile...";
docker build \
--no-cache \
--pull \
@@ -34,7 +34,7 @@ elif [[ $2 =~ $NUMERIC ]]; then
--build-arg GODEBUG \
-t photoprism/$1:latest \
-t photoprism/$1:$2 \
-f docker/${1/-//}/Dockerfile .
-f docker/${1/-//}$3/Dockerfile .
elif [[ $2 == *"preview"* ]]; then
echo "docker/build: building photoprism/$1:$2 from docker/${1/-//}$3/Dockerfile...";
docker build $4\

16
scripts/docker/buildx-multi.sh
View File

@@ -12,18 +12,18 @@ NUMERIC='^[0-9]+$'
GOPROXY=${GOPROXY:-'https://proxy.golang.org,direct'}
DOCKER_TAG=$(date -u +%Y%m%d)
# Kill old multibuilder if still alive.
# kill old multi builder if still alive.
echo "docker/buildx-multi: removing existing multibuilder..."
docker buildx rm multibuilder 2>/dev/null
# Wait 5 seconds.
# wait 5 seconds.
sleep 5
# Create new multibuilder.
# create new multibuilder.
docker buildx create --name multibuilder --use || { echo 'failed'; exit 1; }
if [[ $1 ]] && [[ $2 ]] && [[ -z $3 ]]; then
echo "docker/buildx-multi: building photoprism/$1:preview..."
if [[ $1 ]] && [[ $2 ]] && [[ -z $3 || $3 == "preview" ]]; then
echo "docker/buildx-multi: building photoprism/$1:preview from docker/${1/-//}$4/Dockerfile..."
docker buildx build \
--platform $2 \
--pull \
@@ -31,11 +31,11 @@ if [[ $1 ]] && [[ $2 ]] && [[ -z $3 ]]; then
--build-arg BUILD_TAG=$DOCKER_TAG \
--build-arg GOPROXY \
--build-arg GODEBUG \
-f docker/${1/-//}/Dockerfile \
-f docker/${1/-//}$4/Dockerfile \
-t photoprism/$1:preview \
--push .
elif [[ $3 =~ $NUMERIC ]]; then
echo "docker/buildx-multi: building photoprism/$1:$3,$1:latest..."
echo "docker/buildx-multi: building photoprism/$1:$3,$1:latest from docker/${1/-//}$4/Dockerfile..."
docker buildx build \
--platform $2 \
--pull \
@@ -43,7 +43,7 @@ elif [[ $3 =~ $NUMERIC ]]; then
--build-arg BUILD_TAG=$3 \
--build-arg GOPROXY \
--build-arg GODEBUG \
-f docker/${1/-//}/Dockerfile \
-f docker/${1/-//}$4/Dockerfile \
-t photoprism/$1:latest \
-t photoprism/$1:$3 \
--push .

10
scripts/docker/buildx.sh
View File

@@ -12,8 +12,8 @@ NUMERIC='^[0-9]+$'
GOPROXY=${GOPROXY:-'https://proxy.golang.org,direct'}
DOCKER_TAG=$(date -u +%Y%m%d)
if [[ $1 ]] && [[ $2 ]] && [[ -z $3 ]]; then
echo "docker/buildx: building photoprism/$1:preview..."
if [[ $1 ]] && [[ $2 ]] && [[ -z $3 || $3 == "preview" ]]; then
echo "docker/buildx: building photoprism/$1:preview from docker/${1/-//}$4/Dockerfile..."
docker buildx build \
--platform $2 \
--pull \
@@ -21,11 +21,11 @@ if [[ $1 ]] && [[ $2 ]] && [[ -z $3 ]]; then
--build-arg BUILD_TAG=$DOCKER_TAG \
--build-arg GOPROXY \
--build-arg GODEBUG \
-f docker/${1/-//}/Dockerfile \
-f docker/${1/-//}$4/Dockerfile \
-t photoprism/$1:preview \
--push .
elif [[ $3 =~ $NUMERIC ]]; then
echo "docker/buildx: building photoprism/$1:$3,$1:latest..."
echo "docker/buildx: building photoprism/$1:$3,$1:latest from docker/${1/-//}$4/Dockerfile..."
docker buildx build \
--platform $2 \
--pull \
@@ -33,7 +33,7 @@ elif [[ $3 =~ $NUMERIC ]]; then
--build-arg BUILD_TAG=$3 \
--build-arg GOPROXY \
--build-arg GODEBUG \
-f docker/${1/-//}/Dockerfile \
-f docker/${1/-//}$4/Dockerfile \
-t photoprism/$1:latest \
-t photoprism/$1:$3 \
--push .