CI: Add Dockerfile for 32-bit ARMv7 image with "-armv7" suffix

see https://twitter.com/photoprism_app/status/1469257798987005957
2021-12-10 12:27:35 +01:00 · 2021-12-10 12:27:35 +01:00 · b4cfdf619e
parent d4015065b3
commit b4cfdf619e
6 changed files with 303 additions and 13 deletions
--- a/13
+++ b/13
@ -200,16 +200,19 @@ clean:
 docker-development:
 	docker pull --platform=amd64 ubuntu:21.10
 	docker pull --platform=arm64 ubuntu:21.10
-	docker pull --platform=arm ubuntu:21.10
-	scripts/docker-buildx.sh development linux/amd64,linux/arm64,linux/arm $(DOCKER_TAG)
+	scripts/docker-buildx.sh development linux/amd64,linux/arm64 $(DOCKER_TAG)
 docker-preview:
-	scripts/docker-buildx.sh photoprism linux/amd64,linux/arm64,linux/arm
+	scripts/docker-buildx.sh photoprism linux/amd64,linux/arm64
 docker-release:
-	scripts/docker-buildx.sh photoprism linux/amd64,linux/arm64,linux/arm $(DOCKER_TAG)
+	scripts/docker-buildx.sh photoprism linux/amd64,linux/arm64 $(DOCKER_TAG)
+docker-preview-armv7:
+	scripts/docker-buildx.sh photoprism linux/arm preview-armv7
+docker-release-armv7:
+	scripts/docker-buildx.sh photoprism linux/arm $(DOCKER_TAG)-armv7
 docker-local:
 	scripts/docker-build.sh photoprism
 docker-pull:
-	docker pull photoprism/photoprism:latest
+	docker pull photoprism/photoprism:preview photoprism/photoprism:latest
 docker-goproxy:
 	docker pull golang:alpine
 	scripts/docker-buildx.sh goproxy linux/amd64,linux/arm64 $(DOCKER_TAG)
--- a/docker/goproxy/Dockerfile
+++ b/docker/goproxy/Dockerfile
@ -1,3 +1,4 @@
+##################################################### BUILD STAGE ######################################################
 FROM golang:alpine AS build

 ARG GOPROXY
@ -10,6 +11,7 @@ RUN git clone https://github.com/goproxyio/goproxy.git /src/goproxy && \
    export CGO_ENABLED=0 && \
    make

+################################################## PRODUCTION STAGE ####################################################
 FROM golang:alpine

 ENV TINI_VERSION v0.19.0
--- a/docker/photoprism/Dockerfile
+++ b/docker/photoprism/Dockerfile
@ -1,3 +1,4 @@
+##################################################### BUILD STAGE ######################################################
 FROM photoprism/development:20211209 as build

 ARG TARGETARCH
@ -13,7 +14,7 @@ COPY . .
 # Build frontend and backend
 RUN make dep build-js install

-# Should be the same as used for photoprism/development!
+################################################## PRODUCTION STAGE ####################################################
 FROM ubuntu:21.10

 LABEL maintainer="Michael Mayer <hello@photoprism.org>"
--- a/docker/photoprism/armv7/Dockerfile
+++ b/docker/photoprism/armv7/Dockerfile
@ -0,0 +1,257 @@
+##################################################### BUILD STAGE ######################################################
+FROM ubuntu:21.10
+
+LABEL maintainer="Michael Mayer <hello@photoprism.org>"
+
+ARG TARGETARCH
+ARG TARGETPLATFORM
+ARG BUILD_TAG
+ARG GOPROXY
+ARG GODEBUG
+
+# Set environment variables
+ENV DEBIAN_FRONTEND="noninteractive" \
+    TMPDIR="/tmp" \
+    LD_LIBRARY_PATH="/root/.local/lib:/usr/local/lib:/usr/lib:/lib" \
+    TF_CPP_MIN_LOG_LEVEL="0" \
+    NODE_ENV="production" \
+    GOPATH="/go" \
+    GOBIN="/go/bin" \
+    PATH="/go/bin:/usr/local/go/bin:~/.local/bin:/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \
+    GO111MODULE="on" \
+    CGO_CFLAGS="-g -O2 -Wno-return-local-addr"
+
+# Configure apt
+RUN echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80retry && \
+    echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/80recommends && \
+    echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests && \
+    echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \
+    echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing
+
+# Copy scripts to /root/.local/bin
+COPY --chown=root:root --chmod=755 /docker/scripts/*.sh /root/.local/bin/
+
+# 1. Install distribution packages
+# 2. Install TensorFlow for C
+# 3. Install Chrome, NodeJS, NPM, Puppeteer, TestCafe & ChromeDriver
+# 4. Install Go
+RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \
+    build-essential \
+    ca-certificates \
+    wget \
+    curl \
+    davfs2 \
+    chrpath \
+    libssl-dev \
+    libxft-dev \
+    libfreetype6 \
+    libfreetype6-dev \
+    libfontconfig1 \
+    libfontconfig1-dev \
+    libhdf5-serial-dev \
+    libpng-dev \
+    libzmq3-dev \
+    libx264-dev \
+    libx265-dev \
+    libnss3 \
+    libxtst6 \
+    librsvg2-bin \
+    pkg-config \
+    software-properties-common \
+    rsync \
+    unzip \
+    zip \
+    g++ \
+    gcc \
+    libc6-dev \
+    gpg-agent \
+    apt-utils \
+    make \
+    nano \
+    git \
+    gettext \
+    sqlite3 \
+    tzdata \
+    gconf-service \
+    libheif-examples \
+    exiftool \
+    ffmpeg \
+    ffmpegthumbnailer \
+    libavcodec-extra \
+    sudo && \
+    /root/.local/bin/install-tensorflow.sh ${TARGETARCH} && \
+    /root/.local/bin/install-devtools.sh ${TARGETARCH} && \
+    /root/.local/bin/install-go.sh ${TARGETARCH} && \
+    mkdir -p "/go/src" "/go/bin" && \
+    chmod -R 777 "/go"
+
+# Download TensorFlow models & example files for testing
+RUN rm -rf /tmp/* && mkdir -p /tmp/photoprism && \
+    wget "https://dl.photoprism.org/tensorflow/nsfw.zip?${BUILD_TAG}" -O /tmp/photoprism/nsfw.zip && \
+    wget "https://dl.photoprism.org/tensorflow/nasnet.zip?${BUILD_TAG}" -O /tmp/photoprism/nasnet.zip && \
+    wget "https://dl.photoprism.org/tensorflow/facenet.zip?${BUILD_TAG}" -O /tmp/photoprism/facenet.zip && \
+    wget "https://dl.photoprism.org/qa/testdata.zip?${BUILD_TAG}" -O /tmp/photoprism/testdata.zip
+
+# Copy additional scripts to image
+COPY --chown=root:root /docker/scripts/heif-convert.sh /usr/local/bin/heif-convert
+COPY --chown=root:root /docker/scripts/Makefile /root/Makefile
+COPY --chown=root:root /docker/development/entrypoint.sh /entrypoint.sh
+
+# Install Go tools
+RUN /usr/local/go/bin/go install golang.org/x/tools/cmd/goimports@latest && \
+    /usr/local/go/bin/go install github.com/tianon/gosu@latest && \
+    cp /go/bin/gosu /bin/gosu
+
+# Create photoprism user and directory for deployment
+RUN useradd -m -U -u 1000 -d /photoprism photoprism && chmod a+rwx /photoprism && \
+    mkdir -m 777 -p /var/lib/photoprism /tmp/photoprism && \
+    echo "alias go=richgo" > /photoprism/.bash_aliases && \
+    echo "photoprism ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
+    chown -Rf photoprism:photoprism /photoprism /var/lib/photoprism /tmp/photoprism && \
+    chmod -Rf a+rw /photoprism /var/lib/photoprism /tmp/photoprism /go && \
+    chmod 755 /usr/local/bin/heif-convert /entrypoint.sh && \
+    find /go -type d -print0 | xargs -0 chmod 777
+
+# Set up project directory
+WORKDIR "/go/src/github.com/photoprism/photoprism"
+COPY . .
+
+# Build frontend and backend
+RUN make dep build-js install
+
+################################################## PRODUCTION STAGE ####################################################
+FROM ubuntu:21.10
+
+LABEL maintainer="Michael Mayer <hello@photoprism.org>"
+
+ARG TARGETARCH
+ARG TARGETPLATFORM
+
+# Set environment variables
+ENV DEBIAN_FRONTEND="noninteractive" \
+    TMPDIR="/tmp"
+
+# Configure apt
+RUN echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80retry && \
+    echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/80recommends && \
+    echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests && \
+    echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \
+    echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing
+
+# Install additional distribution packages
+RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \
+    gpgv \
+    wget \
+    curl \
+    make \
+    davfs2 \
+    ca-certificates \
+    mariadb-client \
+    sqlite3 \
+    tzdata \
+    libc6 \
+    libatomic1 \
+    libheif-examples \
+    librsvg2-bin \
+    gnupg \
+    gpg-agent \
+    apt-utils \
+    add-apt-key \
+    exiftool \
+    rawtherapee \
+    ffmpeg \
+    ffmpegthumbnailer \
+    libavcodec-extra  && \
+    [ "$TARGETARCH" = "arm" ] || apt-get install darktable; \
+    apt-get -y autoremove && apt-get -y autoclean && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# Set environment variables, see https://docs.photoprism.org/getting-started/config-options/
+ENV TF_CPP_MIN_LOG_LEVEL="2" \
+    PATH="/photoprism/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \
+    PHOTOPRISM_ASSETS_PATH="/photoprism/assets" \
+    PHOTOPRISM_STORAGE_PATH="/photoprism/storage" \
+    PHOTOPRISM_BACKUP_PATH="/var/lib/photoprism" \
+    PHOTOPRISM_ORIGINALS_PATH="/photoprism/originals" \
+    PHOTOPRISM_IMPORT_PATH="/photoprism/import" \
+    PHOTOPRISM_LOG_FILENAME="/photoprism/photoprism.log" \
+    PHOTOPRISM_PID_FILENAME="/photoprism/photoprism.pid" \
+    PHOTOPRISM_DEBUG="false" \
+    PHOTOPRISM_PUBLIC="false" \
+    PHOTOPRISM_READONLY="false" \
+    PHOTOPRISM_UPLOAD_NSFW="true" \
+    PHOTOPRISM_DETECT_NSFW="false" \
+    PHOTOPRISM_EXPERIMENTAL="false" \
+    PHOTOPRISM_SITE_URL="http://localhost:2342/" \
+    PHOTOPRISM_SITE_TITLE="PhotoPrism" \
+    PHOTOPRISM_SITE_CAPTION="Browse Your Life" \
+    PHOTOPRISM_SITE_DESCRIPTION="" \
+    PHOTOPRISM_SITE_AUTHOR="" \
+    PHOTOPRISM_HTTP_HOST="0.0.0.0" \
+    PHOTOPRISM_HTTP_PORT=2342 \
+    PHOTOPRISM_DATABASE_DRIVER="sqlite" \
+    PHOTOPRISM_DATABASE_SERVER="" \
+    PHOTOPRISM_DATABASE_NAME="photoprism" \
+    PHOTOPRISM_DATABASE_USER="photoprism" \
+    PHOTOPRISM_DATABASE_PASSWORD="" \
+    PHOTOPRISM_DISABLE_CHOWN="false" \
+    PHOTOPRISM_DISABLE_WEBDAV="false" \
+    PHOTOPRISM_DISABLE_SETTINGS="false" \
+    PHOTOPRISM_DISABLE_BACKUPS="false" \
+    PHOTOPRISM_DISABLE_EXIFTOOL="false" \
+    PHOTOPRISM_DISABLE_PLACES="false" \
+    PHOTOPRISM_DISABLE_TENSORFLOW="false" \
+    PHOTOPRISM_DISABLE_FACES="false" \
+    PHOTOPRISM_DISABLE_CLASSIFICATION="false" \
+    PHOTOPRISM_DARKTABLE_PRESETS="false" \
+    PHOTOPRISM_THUMB_FILTER="lanczos" \
+    PHOTOPRISM_THUMB_UNCACHED="false" \
+    PHOTOPRISM_THUMB_SIZE=2048 \
+    PHOTOPRISM_THUMB_SIZE_UNCACHED=7680 \
+    PHOTOPRISM_JPEG_SIZE=7680 \
+    PHOTOPRISM_JPEG_QUALITY=92 \
+    PHOTOPRISM_WORKERS=0 \
+    PHOTOPRISM_WAKEUP_INTERVAL=900 \
+    PHOTOPRISM_AUTO_INDEX=300 \
+    PHOTOPRISM_AUTO_IMPORT=300
+
+# Copy dependencies
+COPY --from=build /go/bin/gosu /bin/gosu
+COPY --from=build /usr/lib/libtensorflow.so /usr/lib/libtensorflow.so
+COPY --from=build /usr/lib/libtensorflow_framework.so /usr/lib/libtensorflow_framework.so
+RUN ldconfig
+
+# Set default umask and create photoprism user
+RUN umask 0000 && useradd -m -U -u 1000 -d /photoprism photoprism && chmod a+rwx /photoprism
+WORKDIR /photoprism
+
+# Copy additional files to image
+COPY --from=build /root/.local/bin/photoprism /photoprism/bin/photoprism
+COPY --from=build /root/.photoprism/assets /photoprism/assets
+COPY --chown=root:root /docker/scripts/heif-convert.sh /usr/local/bin/heif-convert
+COPY --chown=root:root /docker/scripts/Makefile /root/Makefile
+COPY --chown=root:root /docker/photoprism/entrypoint.sh /entrypoint.sh
+
+# Create directories
+RUN mkdir -m 777 -p \
+    /var/lib/photoprism \
+    /tmp/photoprism \
+    /photoprism/originals \
+    /photoprism/import \
+    /photoprism/storage/config \
+    /photoprism/storage/cache && \
+    chown -Rf photoprism:photoprism /photoprism /var/lib/photoprism /tmp/photoprism && \
+    chmod -Rf a+rwx /photoprism /var/lib/photoprism /tmp/photoprism && \
+    chmod 755 /usr/local/bin/heif-convert /entrypoint.sh
+
+# Show photoprism version
+RUN photoprism -v
+
+# Expose http port
+EXPOSE 2342
+
+# Configure entrypoint
+ENTRYPOINT ["/entrypoint.sh"]
+VOLUME /var/lib/photoprism
+
+# Run server
+CMD ["photoprism", "start"]
--- a/scripts/docker-build.sh
+++ b/scripts/docker-build.sh
@ -5,6 +5,7 @@ set -e
 # see https://docs.docker.com/develop/develop-images/build_enhancements/#to-enable-buildkit-builds
 export DOCKER_BUILDKIT=1

+NUMERIC='^[0-9]+$'
 GOPROXY=${GOPROXY:-'https://goproxy.io,direct'}

 if [[ -z $1 ]] && [[ -z $2 ]]; then
@ -21,7 +22,7 @@ elif [[ $1 ]] && [[ -z $2 ]]; then
      -t photoprism/$1:preview \
      -f docker/${1/-//}/Dockerfile .
    echo "Done"
-else
+elif [[ $2 =~ $NUMERIC ]]; then
    echo "Building 'photoprism/$1:$2'...";
    docker build \
      --no-cache \
@ -32,4 +33,14 @@ else
      -t photoprism/$1:$2 \
      -f docker/${1/-//}/Dockerfile .
    echo "Done"
+else
+    echo "Building 'photoprism/$1:$2'...";
+    docker build \
+      --no-cache \
+      --build-arg BUILD_TAG=$2 \
+      --build-arg GOPROXY \
+      --build-arg GODEBUG \
+      -t photoprism/$1:$2 \
+      -f docker/${1/-//}/Dockerfile .
+    echo "Done"
 fi
--- a/scripts/docker-buildx.sh
+++ b/scripts/docker-buildx.sh
@ -8,13 +8,17 @@ if [[ -z $1 ]] || [[ -z $2 ]]; then
    exit 1
 fi

+NUMERIC='^[0-9]+$'
 GOPROXY=${GOPROXY:-'https://goproxy.io,direct'}

+# Kill old multibuilder if still alive.
 echo "Removing existing multibuilder..."
 docker buildx rm multibuilder 2>/dev/null
-sleep 3
-scripts/install-qemu.sh || { echo 'failed'; exit 1; }
-sleep 3
+
+# Wait 5 seconds.
+sleep 5
+
+# Create new multibuilder.
 docker buildx create --name multibuilder --use  || { echo 'failed'; exit 1; }

 if [[ $1 ]] && [[ $2 ]] && [[ -z $3 ]]; then
@ -27,9 +31,22 @@ 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/-//}/Dockerfile \
      -t photoprism/$1:preview \
      --push .
+elif [[ $3 =~ $NUMERIC ]]; then
+    echo "Building 'photoprism/$1:$3'..."
+    docker buildx build \
+      --platform $2 \
+      --pull \
+      --no-cache \
+      --build-arg BUILD_TAG=$3 \
+      --build-arg GOPROXY \
+      --build-arg GODEBUG \
+      -f docker/${1/-//}/Dockerfile \
+      -t photoprism/$1:latest \
+      -t photoprism/$1:$3 \
+      --push .
 else
    echo "Building 'photoprism/$1:$3'..."
    docker buildx build \
@ -39,8 +56,7 @@ else
      --build-arg BUILD_TAG=$3 \
      --build-arg GOPROXY \
      --build-arg GODEBUG \
-      -f docker/$1/Dockerfile \
-      -t photoprism/$1:latest \
+      -f docker/${1/-//}/Dockerfile \
      -t photoprism/$1:$3 \
      --push .
 fi