diff --git a/docker/develop/jammy-slim/Dockerfile b/docker/develop/jammy-slim/Dockerfile index 139580ebe..855b10ca0 100644 --- a/docker/develop/jammy-slim/Dockerfile +++ b/docker/develop/jammy-slim/Dockerfile @@ -46,11 +46,12 @@ 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 darktable rawtherapee libheif-examples librsvg2-bin \ + exiftool rawtherapee libheif-examples librsvg2-bin \ ffmpeg ffmpegthumbnailer libavcodec-extra \ libmatroska7 libdvdread8 libebml5 libgav1-bin libatomic1 \ x264 x265 libvpx7 libwebm1 \ && \ + /scripts/install-darktable.sh && \ echo 'alias ll="ls -alh"' >> /etc/skel/.bashrc && \ echo 'export PS1="\u@$DOCKER_TAG:\w\$ "' >> /etc/skel/.bashrc && \ echo "ALL ALL=(ALL) NOPASSWD:SETENV: /scripts/entrypoint-init.sh" >> /etc/sudoers.d/init && \ diff --git a/docker/develop/jammy/Dockerfile b/docker/develop/jammy/Dockerfile index 20fbe5f06..2493468b5 100644 --- a/docker/develop/jammy/Dockerfile +++ b/docker/develop/jammy/Dockerfile @@ -52,7 +52,7 @@ 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 darktable rawtherapee libheif-examples librsvg2-bin \ + exiftool rawtherapee libheif-examples librsvg2-bin \ ffmpeg ffmpegthumbnailer libavcodec-extra \ libmatroska7 libdvdread8 libebml5 libgav1-bin libatomic1 \ x264 x265 libvpx7 libwebm1 \ @@ -66,6 +66,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ && \ /scripts/install-nodejs.sh && \ /scripts/install-tensorflow.sh && \ + /scripts/install-darktable.sh && \ /scripts/install-chrome.sh && \ /scripts/install-go.sh && \ /scripts/install-go-tools.sh && \ diff --git a/scripts/dist/install-darktable.sh b/scripts/dist/install-darktable.sh index 069c4ba8d..0873ab4e4 100755 --- a/scripts/dist/install-darktable.sh +++ b/scripts/dist/install-darktable.sh @@ -27,7 +27,12 @@ echo "Installing Darktable for ${DESTARCH^^}..." case $DESTARCH in amd64 | AMD64 | x86_64 | x86-64) - if [[ $VERSION_CODENAME == "bullseye" ]]; then + if [[ $VERSION_CODENAME == "jammy" ]]; then + echo 'deb http://download.opensuse.org/repositories/graphics:/darktable/xUbuntu_22.04/ /' | tee /etc/apt/sources.list.d/graphics:darktable.list + curl -fsSL https://download.opensuse.org/repositories/graphics:darktable/xUbuntu_22.04/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/graphics_darktable.gpg > /dev/null + apt-get update + apt-get -qq install darktable + elif [[ $VERSION_CODENAME == "bullseye" ]]; then apt-get update apt-get -qq install -t bullseye-backports darktable elif [[ $VERSION_CODENAME == "buster" ]]; then