From 80da1791df31736f20a12a1bc191d24ef0acc7d9 Mon Sep 17 00:00:00 2001 From: evazion Date: Sat, 23 Apr 2022 14:57:28 -0500 Subject: [PATCH] docker: upgrade base image to Ubuntu 22.04. The Danbooru image now requires at least Docker 20.10.10 to run. If you get weird errors, check `docker version` and make sure you're running a recent enough version of Docker. This is because Ubuntu 22.04 uses Glibc 2.34, which uses the clone3 syscall, which was blocked by Docker's default seccomp policy up until 20.10.10 [1]. You may have to upgrade your distro or install Docker manually [2] if your distro doesn't ship a recent enough version of Docker. A workaround for older versions of Docker is to use the `--security-opt seccomp=unconfined` option to disable seccomp [3]. [1] https://pascalroeleven.nl/2021/09/09/ubuntu-21-10-and-fedora-35-in-docker/ [2] https://docs.docker.com/engine/install/ [3] https://docs.docker.com/engine/security/seccomp/ --- config/docker/Dockerfile.danbooru | 2 +- config/docker/build-base-image.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/docker/Dockerfile.danbooru b/config/docker/Dockerfile.danbooru index 5ee386e08..1c5e65c33 100644 --- a/config/docker/Dockerfile.danbooru +++ b/config/docker/Dockerfile.danbooru @@ -1,4 +1,4 @@ -FROM ubuntu:21.04 AS base +FROM ubuntu:22.04 AS base WORKDIR /danbooru ENV PATH="/root/.asdf/bin:/root/.asdf/shims:$PATH:/usr/lib/postgresql/14/bin" diff --git a/config/docker/build-base-image.sh b/config/docker/build-base-image.sh index 0fe7931ca..bb0b40377 100755 --- a/config/docker/build-base-image.sh +++ b/config/docker/build-base-image.sh @@ -23,8 +23,8 @@ VIPS_BUILD_DEPS=" EXIFTOOL_RUNTIME_DEPS="perl perl-modules libarchive-zip-perl" DANBOORU_RUNTIME_DEPS=" ca-certificates mkvtoolnix rclone libpq5 openssl libgmpxx4ldbl - zlib1g libfftw3-3 libwebp6 libwebpmux3 libwebpdemux2 liborc-0.4.0 liblcms2-2 - libpng16-16 libexpat1 libglib2.0 libgif7 libexif12 libheif1 libvpx6 + zlib1g libfftw3-3 libwebp7 libwebpmux3 libwebpdemux2 liborc-0.4.0 liblcms2-2 + libpng16-16 libexpat1 libglib2.0 libgif7 libexif12 libheif1 libvpx7 libseccomp2 libseccomp-dev libjemalloc2 " COMMON_RUNTIME_DEPS="