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

HEIF: Install custom heif-convert build in jammy Docker images #2726

Browse Source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2022-10-06 21:02:50 +02:00
parent 14d89132e9
commit dce15a08a1
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/develop/jammy-slim/Dockerfile
View File

@ -46,10 +46,10 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
libc6 ca-certificates sudo bash tzdata \
gpg zip unzip wget curl rsync make nano \
jq lsof lshw sqlite3 mariadb-client imagemagick \
exiftool rawtherapee libheif-examples librsvg2-bin \
exiftool rawtherapee librsvg2-bin \
ffmpeg ffmpegthumbnailer libavcodec-extra \
libmatroska7 libdvdread8 libebml5 libgav1-bin libatomic1 \
x264 x265 libvpx7 libwebm1 \
x264 x265 libde265-dev libjpeg8 libvpx7 libwebm1 \
&& \
/scripts/install-darktable.sh && \
echo 'alias ll="ls -alh"' >> /etc/skel/.bashrc && \
@ -57,7 +57,9 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
echo "ALL ALL=(ALL) NOPASSWD:SETENV: /scripts/entrypoint-init.sh" >> /etc/sudoers.d/init && \
cp /etc/skel/.bashrc /root/.bashrc && \
/scripts/create-users.sh && \
cp /scripts/heif-convert.sh /usr/local/bin/heif-convert && \
cp /scripts/heif-convert.sh /usr/local/bin/heif-convert.sh && \
(wget --inet4-only -c "https://dl.photoprism.app/dist/libheif/libheif.jammy.tar.gz" -O - | tar -xz -C /usr/local) && \
ldconfig && \
install -d -m 0777 -o 1000 -g 1000 \
/photoprism/originals \
/photoprism/import \

9
docker/develop/jammy/Dockerfile
View File

@ -52,14 +52,15 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
libc6 ca-certificates sudo bash tzdata \
gpg zip unzip wget curl rsync make nano \
jq lsof lshw sqlite3 mariadb-client imagemagick \
exiftool rawtherapee libheif-examples librsvg2-bin \
exiftool rawtherapee librsvg2-bin \
ffmpeg ffmpegthumbnailer libavcodec-extra \
libmatroska7 libdvdread8 libebml5 libgav1-bin libatomic1 \
x264 x265 libvpx7 libwebm1 \
x264 x265 libde265-dev libjpeg8 libvpx7 libwebm1 \
&& \
apt-get -qq install \
apt-utils pkg-config software-properties-common \
build-essential gcc g++ git gettext davfs2 chrpath apache2-utils \
autoconf automake cmake libtool libjpeg8-dev \
libx264-dev libx265-dev libvpx-dev libwebm-dev libpng-dev libxft-dev \
libc6-dev libhdf5-serial-dev libzmq3-dev libssl-dev libnss3 \
libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev fonts-roboto \
@ -75,7 +76,9 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
echo "ALL ALL=(ALL) NOPASSWD:SETENV: ALL" >> /etc/sudoers.d/all && \
cp /etc/skel/.bashrc /root/.bashrc && \
/scripts/create-users.sh && \
cp /scripts/heif-convert.sh /usr/local/bin/heif-convert && \
cp /scripts/heif-convert.sh /usr/local/bin/heif-convert.sh && \
(wget --inet4-only -c "https://dl.photoprism.app/dist/libheif/libheif.jammy.tar.gz" -O - | tar -xz -C /usr/local) && \
ldconfig && \
install -d -m 0777 -o 1000 -g 1000 \
/photoprism/originals \
/photoprism/import \