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

Docker: Update buster/impish images, add Makefile targets

Browse source
This commit is contained in:
Michael Mayer 2022-03-28 11:36:13 +02:00
parent ca0c771826
commit a18a94f640
6 changed files with 34 additions and 10 deletions
Makefile
docker
develop
buster
Dockerfilesources.list
impish
Dockerfile
photoprism
buster
Dockerfile
impish
Dockerfile

29
Makefile
View file

@ -335,12 +335,35 @@ docker-release-impish:
docker pull --platform=arm64 ubuntu:impish
scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 impish /impish
docker-local: docker-local-bookworm
docker-local-bullseye:
docker pull photoprism/develop:bullseye
scripts/docker/build.sh photoprism bullseye /bullseye
docker-local-bookworm:
docker pull photoprism/develop:bookworm
docker pull photoprism/develop:bookworm-slim
scripts/docker/build.sh photoprism bookworm /bookworm
docker-local-bullseye:
docker pull photoprism/develop:bullseye
docker pull photoprism/develop:bullseye-slim
scripts/docker/build.sh photoprism bullseye /bullseye
docker-local-buster:
docker pull photoprism/develop:buster
docker pull debian:buster-slim
scripts/docker/build.sh photoprism buster /buster
docker-local-impish:
docker pull photoprism/develop:impish
docker pull ubuntu:impish
scripts/docker/build.sh photoprism impish /impish
docker-local-develop: docker-local-develop-bookworm
docker-local-develop-bookworm:
docker pull debian:bookworm-slim
scripts/docker/build.sh develop bookworm /bookworm
docker-local-develop-bullseye:
docker pull golang:1.18-bullseye
scripts/docker/build.sh develop bullseye /bullseye
docker-local-develop-buster:
docker pull golang:1.18-buster
scripts/docker/build.sh develop buster /buster
docker-local-develop-impish:
docker pull ubuntu:impish
scripts/docker/build.sh develop impish /impish
docker-pull:
docker pull photoprism/photoprism:preview photoprism/photoprism:latest
docker-ddns:

6
docker/develop/buster/Dockerfile
View file

@ -1,5 +1,5 @@
#### Base Image: Debian 10, Codename "Buster"
FROM golang:buster
FROM golang:1.18-buster
LABEL maintainer="Michael Mayer <hello@photoprism.app>"
@ -13,11 +13,11 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
NODE_ENV="production" \
DEBIAN_FRONTEND="noninteractive" \
TMPDIR="/tmp" \
LD_LIBRARY_PATH="/root/.local/lib:/usr/local/lib:/usr/lib:/lib" \
LD_LIBRARY_PATH="/root/.local/lib:/usr/local/lib:/usr/lib" \
TF_CPP_MIN_LOG_LEVEL="0" \
GOPATH="/go" \
GOBIN="/go/bin" \
PATH="/usr/local/sbin:/usr/sbin:/sbin:/bin:/scripts:/usr/local/go/bin:/go/bin:/usr/local/bin:/usr/bin" \
PATH="/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin:/scripts:/usr/local/go/bin:/go/bin" \
GO111MODULE="on" \
CGO_CFLAGS="-g -O2 -Wno-return-local-addr"

1
docker/develop/buster/sources.list
View file

@ -1,3 +1,4 @@
deb http://deb.debian.org/debian buster contrib non-free
deb http://deb.debian.org/debian buster-updates contrib non-free
deb http://deb.debian.org/debian buster-backports main contrib non-free
deb http://security.debian.org/debian-security buster/updates main contrib non-free

4
docker/develop/impish/Dockerfile
View file

@ -13,11 +13,11 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
NODE_ENV="production" \
DEBIAN_FRONTEND="noninteractive" \
TMPDIR="/tmp" \
LD_LIBRARY_PATH="/root/.local/lib:/usr/local/lib:/usr/lib:/lib" \
LD_LIBRARY_PATH="/root/.local/lib:/usr/local/lib:/usr/lib" \
TF_CPP_MIN_LOG_LEVEL="0" \
GOPATH="/go" \
GOBIN="/go/bin" \
PATH="/usr/local/sbin:/usr/sbin:/sbin:/bin:/scripts:/usr/local/go/bin:/go/bin:/usr/local/bin:/usr/bin" \
PATH="/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin:/scripts:/usr/local/go/bin:/go/bin" \
GO111MODULE="on" \
CGO_CFLAGS="-g -O2 -Wno-return-local-addr"

2
docker/photoprism/buster/Dockerfile
View file

@ -24,7 +24,7 @@ ARG BUILD_TAG
ENV PHOTOPRISM_ARCH=$TARGETARCH \
DOCKER_TAG=$BUILD_TAG \
DOCKER_ENV="prod" \
PATH="/usr/local/sbin:/usr/sbin:/sbin:/bin:/scripts:/opt/photoprism/bin:/usr/local/bin:/usr/bin" \
PATH="/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin:/scripts:/opt/photoprism/bin" \
TMPDIR="/tmp" \
DEBIAN_FRONTEND="noninteractive" \
TF_CPP_MIN_LOG_LEVEL="2" \

2
docker/photoprism/impish/Dockerfile
View file

@ -24,7 +24,7 @@ ARG BUILD_TAG
ENV PHOTOPRISM_ARCH=$TARGETARCH \
DOCKER_TAG=$BUILD_TAG \
DOCKER_ENV="prod" \
PATH="/usr/local/sbin:/usr/sbin:/sbin:/bin:/scripts:/opt/photoprism/bin:/usr/local/bin:/usr/bin" \
PATH="/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin:/scripts:/opt/photoprism/bin" \
TMPDIR="/tmp" \
DEBIAN_FRONTEND="noninteractive" \
TF_CPP_MIN_LOG_LEVEL="2" \