Docker: Add firefox-esr to bullseye base images and update build scripts

2022-02-16 15:41:58 +01:00 · 2022-02-16 15:41:58 +01:00 · 36ae97ac5c
commit 36ae97ac5c
parent f1acf801b0
12 changed files with 49 additions and 25 deletions
--- a/28
+++ b/28
@ -203,32 +203,34 @@ clean:
 	rm -rf storage/cache
 	rm -rf frontend/node_modules
 docker-develop: docker-develop-impish docker-develop-bullseye docker-develop-buster docker-develop-armv7
-docker-develop-impish:
-	docker pull --platform=amd64 ubuntu:impish
-	docker pull --platform=arm64 ubuntu:impish
-	scripts/docker/buildx-multi.sh develop linux/amd64,linux/arm64 $(DOCKER_TAG) /impish
 docker-develop-bullseye:
 	docker pull --platform=amd64 golang:bullseye
 	docker pull --platform=arm64 golang:bullseye
-	scripts/docker/buildx-multi.sh develop linux/amd64,linux/arm64 bullseye /bullseye
+	scripts/docker/buildx-multi.sh develop linux/amd64,linux/arm64 bullseye /bullseye "-t photoprism/develop:latest"
 docker-develop-buster:
 	docker pull --platform=amd64 golang:buster
 	docker pull --platform=arm64 golang:buster
 	scripts/docker/buildx-multi.sh develop linux/amd64,linux/arm64 buster /buster
+docker-develop-impish:
+	docker pull --platform=amd64 ubuntu:impish
+	docker pull --platform=arm64 ubuntu:impish
+	scripts/docker/buildx-multi.sh develop linux/amd64,linux/arm64 impish /impish
 docker-develop-armv7:
 	docker pull --platform=arm golang:bullseye
 	scripts/docker/buildx.sh develop linux/arm armv7 /armv7
 docker-preview: docker-preview-impish docker-preview-bullseye docker-preview-buster
-docker-preview-impish:
-	scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 preview /impish
 docker-preview-bullseye:
 	docker pull --platform=amd64 photoprism/develop:bullseye
 	docker pull --platform=arm64 photoprism/develop:bullseye
-	scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 preview-bullseye /bullseye
+	scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 preview /bullseye
 docker-preview-buster:
 	docker pull --platform=amd64 photoprism/develop:buster
 	docker pull --platform=arm64 photoprism/develop:buster
 	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
+	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
@ -236,18 +238,18 @@ docker-preview-armv7:
 	docker pull --platform=arm photoprism/develop:armv7
 	scripts/docker/buildx.sh photoprism linux/arm preview-armv7 /armv7
 docker-release: docker-release-impish docker-release-bullseye docker-release-buster
-docker-release-impish:
-	docker pull --platform=amd64 photoprism/develop:impish
-	docker pull --platform=arm64 photoprism/develop:impish
-	scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 $(DOCKER_TAG) /impish
 docker-release-bullseye:
 	docker pull --platform=amd64 photoprism/develop:bullseye
 	docker pull --platform=arm64 photoprism/develop:bullseye
-	scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 bullseye /bullseye
+	scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 bullseye /bullseye "-t photoprism/photoprism:latest"
 docker-release-buster:
 	docker pull --platform=amd64 photoprism/develop:buster
 	docker pull --platform=arm64 photoprism/develop:buster
 	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
+	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
--- a/docker/develop/armv7/Dockerfile
+++ b/docker/develop/armv7/Dockerfile
@ -1,3 +1,4 @@
+#### Debian 11 (Bullseye)
 FROM golang:bullseye

 LABEL maintainer="Michael Mayer <hello@photoprism.org>"
--- a/docker/develop/bullseye/Dockerfile
+++ b/docker/develop/bullseye/Dockerfile
@ -1,3 +1,4 @@
+#### Debian 11 (Bullseye)
 FROM golang:bullseye

 LABEL maintainer="Michael Mayer <hello@photoprism.app>"
@ -53,8 +54,8 @@ RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-insta
    git \
    gettext \
    chromium \
-    chromium \
    chromium-driver \
+    firefox-esr \
    mariadb-client \
    sqlite3 \
    libc6-dev \
--- a/docker/develop/buster/Dockerfile
+++ b/docker/develop/buster/Dockerfile
@ -1,3 +1,4 @@
+#### Debian 10 (Buster)
 FROM golang:buster

 LABEL maintainer="Michael Mayer <hello@photoprism.app>"
@ -53,7 +54,6 @@ RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-insta
    git \
    gettext \
    chromium \
-    chromium \
    chromium-driver \
    mariadb-client \
    sqlite3 \
--- a/docker/develop/impish/Dockerfile
+++ b/docker/develop/impish/Dockerfile
@ -1,3 +1,4 @@
+#### Ubuntu 21.10 (Impish Indri)
 FROM ubuntu:impish

 LABEL maintainer="Michael Mayer <hello@photoprism.app>"
@ -36,6 +37,8 @@ RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-insta
    gpg-agent \
    ca-certificates \
    build-essential \
+    g++ \
+    gcc \
    bash \
    make \
    nano \
@ -43,9 +46,11 @@ RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-insta
    curl \
    git \
    gettext \
+    firefox \
    mariadb-client \
    davfs2 \
    chrpath \
+    libc6-dev \
    libssl-dev \
    libxft-dev \
    libfreetype6 \
@ -65,13 +70,9 @@ RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-insta
    rsync \
    unzip \
    zip \
-    g++ \
-    gcc \
-    libc6-dev \
    sqlite3 \
    tzdata \
    gconf-service \
-    firefox \
    libheif-examples \
    exiftool \
    rawtherapee \
--- a/docker/photoprism/armv7/Dockerfile
+++ b/docker/photoprism/armv7/Dockerfile
@ -15,6 +15,7 @@ COPY . .
 RUN make npm dep build-js install

 ################################################## PRODUCTION STAGE ####################################################
+#### Debian 11 (Bullseye)
 FROM debian:bullseye-slim

 LABEL maintainer="Michael Mayer <hello@photoprism.org>"
--- a/docker/photoprism/bullseye/Dockerfile
+++ b/docker/photoprism/bullseye/Dockerfile
@ -15,6 +15,7 @@ COPY . .
 RUN make npm dep build-js install

 ################################################## PRODUCTION STAGE ####################################################
+#### Debian 11 (Bullseye)
 FROM debian:bullseye-slim

 LABEL maintainer="Michael Mayer <hello@photoprism.app>"
--- a/docker/photoprism/buster/Dockerfile
+++ b/docker/photoprism/buster/Dockerfile
@ -15,6 +15,7 @@ COPY . .
 RUN make npm dep build-js install

 ################################################## PRODUCTION STAGE ####################################################
+#### Debian 10 (Buster)
 FROM debian:buster-slim

 LABEL maintainer="Michael Mayer <hello@photoprism.app>"
--- a/docker/photoprism/impish/Dockerfile
+++ b/docker/photoprism/impish/Dockerfile
@ -1,5 +1,5 @@
 ##################################################### BUILD STAGE ######################################################
-FROM photoprism/develop:20220216 as build
+FROM photoprism/develop:impish as build

 ARG TARGETARCH
 ARG TARGETPLATFORM
@ -15,6 +15,7 @@ COPY .. .
 RUN make npm dep build-js install

 ################################################## PRODUCTION STAGE ####################################################
+#### Ubuntu 21.10 (Impish Indri)
 FROM ubuntu:impish

 LABEL maintainer="Michael Mayer <hello@photoprism.app>"
--- a/scripts/docker/build.sh
+++ b/scripts/docker/build.sh
@ -47,6 +47,11 @@ elif [[ $2 == *"preview"* ]]; then
      -f docker/${1/-//}$3/Dockerfile .
 else
    echo "docker/build: building photoprism/$1:$2,$1:$DOCKER_TAG-$2 from docker/${1/-//}$3/Dockerfile...";
+
+    if [[ $5 ]]; then
+      echo "extra params: $5"
+    fi
+
    docker build $4\
      --no-cache \
      --pull \
@ -54,7 +59,7 @@ else
      --build-arg GOPROXY \
      --build-arg GODEBUG \
      -t photoprism/$1:$2 \
-      -t photoprism/$1:$DOCKER_TAG-$2 \
+      -t photoprism/$1:$DOCKER_TAG-$2 $5 \
      -f docker/${1/-//}$3/Dockerfile .
 fi

--- a/scripts/docker/buildx-multi.sh
+++ b/scripts/docker/buildx-multi.sh
@ -16,8 +16,8 @@ DOCKER_TAG=$(date -u +%Y%m%d)
 echo "docker/buildx-multi: removing existing multibuilder..."
 docker buildx rm multibuilder 2>/dev/null

-# wait 5 seconds.
-sleep 5
+# wait 3 seconds.
+sleep 3

 # create new multibuilder.
 docker buildx create --name multibuilder --use  || { echo 'failed'; exit 1; }
@ -61,6 +61,11 @@ elif [[ $4 ]] && [[ $3 == *"preview"* ]]; then
      --push .
 elif [[ $4 ]]; then
    echo "docker/buildx-multi: building photoprism/$1:$3,$1:$DOCKER_TAG-$3 from docker/${1/-//}$4/Dockerfile..."
+
+    if [[ $5 ]]; then
+      echo "extra params: $5"
+    fi
+
    docker buildx build \
      --platform $2 \
      --pull \
@ -70,7 +75,7 @@ elif [[ $4 ]]; then
      --build-arg GODEBUG \
      -f docker/${1/-//}$4/Dockerfile \
      -t photoprism/$1:$3 \
-      -t photoprism/$1:$DOCKER_TAG-$3 \
+      -t photoprism/$1:$DOCKER_TAG-$3 $5 \
      --push .
 else
    echo "docker/buildx-multi: building photoprism/$1:$3 from docker/${1/-//}/Dockerfile..."
--- a/scripts/docker/buildx.sh
+++ b/scripts/docker/buildx.sh
@ -51,6 +51,11 @@ elif [[ $4 ]] && [[ $3 == *"preview"* ]]; then
      --push .
 else
    echo "docker/buildx: building photoprism/$1:$3,$1:$DOCKER_TAG-$3 from docker/${1/-//}$4/Dockerfile..."
+
+    if [[ $5 ]]; then
+      echo "extra params: $5"
+    fi
+
    docker buildx build \
      --platform $2 \
      --pull \
@ -60,7 +65,7 @@ else
      --build-arg GODEBUG \
      -f docker/${1/-//}$4/Dockerfile \
      -t photoprism/$1:$3 \
-      -t photoprism/$1:$DOCKER_TAG-$3 \
+      -t photoprism/$1:$DOCKER_TAG-$3 $5 \
      --push .
 fi