Docker: Ubuntu 20.04 upgrade #445
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer
parent
f737edbe99
commit
d82f2a1446
8 changed files with 33 additions and 29 deletions
|
|
@ -1,4 +1,4 @@
|
|||
FROM photoprism/development:20200721
|
||||
FROM photoprism/development:20200812
|
||||
|
||||
# Set up project directory
|
||||
WORKDIR "/go/src/github.com/photoprism/photoprism"
|
||||
|
|
|
|||
|
|
@ -72,4 +72,4 @@ services:
|
|||
MYSQL_DATABASE: photoprism
|
||||
|
||||
webdav-dummy:
|
||||
image: photoprism/webdav:20200327
|
||||
image: photoprism/webdav:20200812
|
||||
|
|
|
|||
|
|
@ -19,9 +19,7 @@ services:
|
|||
- photoprism-db
|
||||
ports:
|
||||
- "2342:2342" # Web Server (PhotoPrism)
|
||||
- "2343:2343"
|
||||
expose:
|
||||
- "2343" # Acceptance Tests
|
||||
- "2343:2343" # Acceptance Tests
|
||||
volumes:
|
||||
- ".:/go/src/github.com/photoprism/photoprism"
|
||||
- "go-mod:/go/pkg/mod"
|
||||
|
|
@ -78,7 +76,7 @@ services:
|
|||
MYSQL_DATABASE: photoprism
|
||||
|
||||
webdav-dummy:
|
||||
image: photoprism/webdav:20200327
|
||||
image: photoprism/webdav:20200812
|
||||
|
||||
volumes:
|
||||
go-mod:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM ubuntu:18.04
|
||||
FROM ubuntu:20.04
|
||||
|
||||
LABEL maintainer="Michael Mayer <michael@liquidbytes.net>"
|
||||
|
||||
|
|
@ -7,11 +7,11 @@ ARG BUILD_TAG
|
|||
ENV DEBIAN_FRONTEND noninteractive
|
||||
|
||||
# Configure apt-get
|
||||
RUN echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80retry
|
||||
RUN echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/80recommends
|
||||
RUN echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests
|
||||
RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes
|
||||
RUN echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissin
|
||||
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/80fixmissin
|
||||
|
||||
# Install dev / build dependencies
|
||||
RUN apt-get update && apt-get upgrade && \
|
||||
|
|
@ -46,18 +46,21 @@ RUN apt-get update && apt-get upgrade && \
|
|||
mysql-client \
|
||||
tzdata \
|
||||
gconf-service \
|
||||
chromium-browser \
|
||||
firefox \
|
||||
libheif-examples \
|
||||
exiftool \
|
||||
ffmpeg \
|
||||
lsof
|
||||
|
||||
# Install Chromium Browser via .deb
|
||||
RUN add-apt-repository -y ppa:xalt7x/chromium-deb-vaapi
|
||||
COPY /docker/development/pin-xalt7x-chromium-deb-vaapi /etc/apt/preferences.d/pin-xalt7x-chromium-deb-vaapi
|
||||
|
||||
# Install RAW to JPEG converter
|
||||
RUN sh -c "echo 'deb http://download.opensuse.org/repositories/graphics:/darktable/xUbuntu_18.04/ /' > /etc/apt/sources.list.d/graphics:darktable.list" && \
|
||||
wget -qO - https://download.opensuse.org/repositories/graphics:darktable/xUbuntu_18.04/Release.key | apt-key add - && \
|
||||
RUN sh -c "echo 'deb http://download.opensuse.org/repositories/graphics:/darktable/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/graphics:darktable.list" && \
|
||||
wget -qO - https://download.opensuse.org/repositories/graphics:darktable/xUbuntu_20.04/Release.key | apt-key add - && \
|
||||
apt-get update && \
|
||||
apt-get install darktable && \
|
||||
apt-get install chromium-browser chromium-codecs-ffmpeg-extra darktable && \
|
||||
apt-get upgrade && \
|
||||
apt-get dist-upgrade
|
||||
|
||||
|
|
@ -87,12 +90,12 @@ RUN npm install --unsafe-perm=true --allow-root -g npm testcafe chromedriver
|
|||
RUN npm config set cache ~/.cache/npm
|
||||
|
||||
# Install Go
|
||||
ENV GOLANG_VERSION 1.14.6
|
||||
ENV GOLANG_VERSION 1.15
|
||||
RUN set -eux; \
|
||||
\
|
||||
url="https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz"; \
|
||||
wget -O go.tgz "$url"; \
|
||||
echo "5c566ddc2e0bcfc25c26a5dc44a440fcc0177f7350c1f01952b34d5989a0d287 *go.tgz" | sha256sum -c -; \
|
||||
echo "2d75848ac606061efe52a8068d0e647b35ce487a15bb52272c427df485193602 *go.tgz" | sha256sum -c -; \
|
||||
tar -C /usr/local -xzf go.tgz; \
|
||||
rm go.tgz; \
|
||||
export PATH="/usr/local/go/bin:$PATH"; \
|
||||
|
|
@ -124,8 +127,8 @@ COPY /docker/development/.my.cnf /root/.my.cnf
|
|||
# Set up project directory
|
||||
WORKDIR "/go/src/github.com/photoprism/photoprism"
|
||||
|
||||
# Expose HTTP port 2342 plus 9515 for chromedriver
|
||||
EXPOSE 2342 9515
|
||||
# Expose HTTP port 2342, 2343 plus 9515 for chromedriver
|
||||
EXPOSE 2342 2343 9515
|
||||
|
||||
# Keep container running (services can be started manually using a terminal)
|
||||
CMD tail -f /dev/null
|
||||
|
|
|
|||
3
docker/development/pin-xalt7x-chromium-deb-vaapi
Normal file
3
docker/development/pin-xalt7x-chromium-deb-vaapi
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
Package: *
|
||||
Pin: release o=LP-PPA-xalt7x-chromium-deb-vaapi
|
||||
Pin-Priority: 1337
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
FROM photoprism/development:20200721 as build
|
||||
FROM photoprism/development:20200812 as build
|
||||
|
||||
# Set up project directory
|
||||
WORKDIR "/go/src/github.com/photoprism/photoprism"
|
||||
|
|
@ -8,7 +8,7 @@ COPY . .
|
|||
RUN make dep build-js install
|
||||
|
||||
# Same base image as photoprism/development
|
||||
FROM ubuntu:18.04
|
||||
FROM ubuntu:20.04
|
||||
|
||||
# Set environment variables
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
|
|
@ -39,8 +39,8 @@ COPY --from=build /usr/lib/libtensorflow_framework.so /usr/lib/libtensorflow_fra
|
|||
RUN ldconfig
|
||||
|
||||
# Install RAW to JPEG converter
|
||||
RUN sh -c "echo 'deb http://download.opensuse.org/repositories/graphics:/darktable/xUbuntu_18.04/ /' > /etc/apt/sources.list.d/graphics:darktable.list" && \
|
||||
wget -qO - https://download.opensuse.org/repositories/graphics:darktable/xUbuntu_18.04/Release.key | apt-key add - && \
|
||||
RUN sh -c "echo 'deb http://download.opensuse.org/repositories/graphics:/darktable/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/graphics:darktable.list" && \
|
||||
wget -qO - https://download.opensuse.org/repositories/graphics:darktable/xUbuntu_20.04/Release.key | apt-key add - && \
|
||||
apt-get update && \
|
||||
apt-get install darktable && \
|
||||
apt-get upgrade && \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM ubuntu:18.04 as build
|
||||
FROM ubuntu:20.04 as build
|
||||
|
||||
LABEL maintainer="Michael Mayer <michael@liquidbytes.net>"
|
||||
|
||||
|
|
@ -70,12 +70,12 @@ RUN npm install --unsafe-perm=true --allow-root -g npm
|
|||
RUN npm config set cache ~/.cache/npm
|
||||
|
||||
# Install Go
|
||||
ENV GOLANG_VERSION 1.14.6
|
||||
ENV GOLANG_VERSION 1.15
|
||||
RUN set -eux; \
|
||||
\
|
||||
url="https://golang.org/dl/go${GOLANG_VERSION}.linux-arm64.tar.gz"; \
|
||||
wget -O go.tgz "$url"; \
|
||||
echo "291bccfd7d7f1915599bbcc90e49d9fccfcb0004b7c62a2f5cdf0f96a09d6a3e *go.tgz" | sha256sum -c -; \
|
||||
echo "7e18d92f61ddf480a4f9a57db09389ae7b9dadf68470d0cb9c00d734a0c57f8d *go.tgz" | sha256sum -c -; \
|
||||
tar -C /usr/local -xzf go.tgz; \
|
||||
rm go.tgz; \
|
||||
export PATH="/usr/local/go/bin:$PATH"; \
|
||||
|
|
@ -101,7 +101,7 @@ COPY . .
|
|||
RUN make dep build-js install
|
||||
|
||||
# Same base image as photoprism/development
|
||||
FROM ubuntu:18.04
|
||||
FROM ubuntu:20.04
|
||||
|
||||
# Set environment variables
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM golang:1.14
|
||||
FROM golang:1.15
|
||||
|
||||
LABEL maintainer="Michael Mayer <michael@liquidbytes.net>"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue