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

Docker: Use debian:bullseye-slim as ARMv7 develop base image

Browse source
This commit is contained in:
Michael Mayer 2022-02-20 16:15:54 +01:00
parent 4d6c3a78bb
commit adeaab919a
6 changed files with 58 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -231,7 +231,7 @@ docker-develop-bullseye:
docker pull --platform=arm64 golang:bullseye
scripts/docker/buildx-multi.sh develop linux/amd64,linux/arm64 bullseye /bullseye "-t photoprism/develop:latest"
docker-develop-armv7:
docker pull --platform=arm golang:bullseye
docker pull --platform=arm debian:bullseye-slim
scripts/docker/buildx.sh develop linux/arm armv7 /armv7
docker-develop-buster:
docker pull --platform=amd64 golang:buster

6
docker/develop/armv7/Dockerfile
View file

@ -1,5 +1,5 @@
#### Base Image: Debian 10, Codename "Bullseye"
FROM golang:bullseye
#### Base Image: Debian 11, Codename "Bullseye"
FROM debian:bullseye-slim
LABEL maintainer="Michael Mayer <hello@photoprism.app>"
@ -25,6 +25,7 @@ ENV DOCKER_ARCH=$TARGETARCH \
# copy scripts and debian backports sources list
COPY --chown=root:root --chmod=755 /scripts/dist/* /root/.local/bin/
COPY --chown=root:root --chmod=644 /docker/develop/bullseye/backports.list /etc/apt/sources.list.d/backports.list
COPY --chown=root:root --chmod=755 /docker/develop/entrypoint.sh /entrypoint.sh
COPY --chown=root:root --chmod=644 /.my.cnf /etc/my.cnf
@ -80,6 +81,7 @@ RUN echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80retry && \
sudo && \
/root/.local/bin/install-nodejs.sh && \
/root/.local/bin/install-tensorflow.sh && \
/root/.local/bin/install-go.sh && \
/root/.local/bin/cleanup.sh && \
mkdir -p "/go/src" "/go/bin" && \
chmod -R 777 "/go" && \

2
docker/develop/bullseye/Dockerfile
View file

@ -1,4 +1,4 @@
#### Base Image: Debian 10, Codename "Bullseye"
#### Base Image: Debian 11, Codename "Bullseye"
FROM golang:bullseye
LABEL maintainer="Michael Mayer <hello@photoprism.app>"

100
docker/develop/impish/Dockerfile
View file

@ -36,56 +36,56 @@ RUN echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80retry && \
echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \
useradd -m -U -u 1000 -d /photoprism photoprism && \
apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \
apt-utils \
gpg \
gpg-agent \
pkg-config \
software-properties-common \
ca-certificates \
build-essential \
g++ \
gcc \
bash \
make \
nano \
wget \
curl \
git \
gettext \
firefox \
mariadb-client \
davfs2 \
chrpath \
libc6-dev \
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 \
rsync \
unzip \
zip \
sqlite3 \
tzdata \
libheif-examples \
exiftool \
rawtherapee \
ffmpeg \
ffmpegthumbnailer \
libavcodec-extra \
lsof \
apache2-utils \
fonts-roboto \
sudo && \
apt-utils \
gpg \
gpg-agent \
pkg-config \
software-properties-common \
ca-certificates \
build-essential \
g++ \
gcc \
bash \
make \
nano \
wget \
curl \
git \
gettext \
firefox \
mariadb-client \
davfs2 \
chrpath \
libc6-dev \
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 \
rsync \
unzip \
zip \
sqlite3 \
tzdata \
libheif-examples \
exiftool \
rawtherapee \
ffmpeg \
ffmpegthumbnailer \
libavcodec-extra \
lsof \
apache2-utils \
fonts-roboto \
sudo && \
/root/.local/bin/install-nodejs.sh && \
/root/.local/bin/install-tensorflow.sh && \
/root/.local/bin/install-darktable.sh && \

2
docker/photoprism/armv7/Dockerfile
View file

@ -14,7 +14,7 @@ COPY . .
RUN make all install DESTDIR=/opt/photoprism
################################################## PRODUCTION STAGE ####################################################
#### Base Image: Debian 10, Codename "Bullseye"
#### Base Image: Debian 11, Codename "Bullseye"
FROM debian:bullseye-slim
LABEL maintainer="Michael Mayer <hello@photoprism.app>"

2
docker/photoprism/bullseye/Dockerfile
View file

@ -14,7 +14,7 @@ COPY . .
RUN make all install DESTDIR=/opt/photoprism
################################################## PRODUCTION STAGE ####################################################
#### Base Image: Debian 10, Codename "Bullseye"
#### Base Image: Debian 11, Codename "Bullseye"
FROM debian:bullseye-slim
LABEL maintainer="Michael Mayer <hello@photoprism.app>"