From f0ff32bb687953a6d1f916f21ec61c458c8df5bf Mon Sep 17 00:00:00 2001 From: evazion Date: Fri, 30 Apr 2021 03:54:38 -0500 Subject: [PATCH] docker: fix missing TLS certs in Docker image. Fix the ca-certificates package not being installed inside the base Docker image. This caused uploads from HTTPS sites to fail because TLS certificates couldn't be validated. --- config/docker/build-base-image.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/config/docker/build-base-image.sh b/config/docker/build-base-image.sh index c5a063009..287a9c76f 100755 --- a/config/docker/build-base-image.sh +++ b/config/docker/build-base-image.sh @@ -16,10 +16,9 @@ VIPS_BUILD_DEPS=" libjpeg-turbo8-dev libexpat1-dev libglib2.0-dev libgif-dev libexif-dev " DANBOORU_RUNTIME_DEPS=" - mkvtoolnix postgresql-client-12 libpq5 libxml2 libxslt1.1 zlib1g - libfftw3-3 libwebp6 libwebpmux3 libwebpdemux2 liborc-0.4.0 liblcms2-2 - libpng16-16 libjpeg-turbo8 libexpat1 libglib2.0 libgif7 libexif12 - libvpx6 + ca-certificates mkvtoolnix postgresql-client-12 libpq5 libxml2 libxslt1.1 + zlib1g libfftw3-3 libwebp6 libwebpmux3 libwebpdemux2 liborc-0.4.0 liblcms2-2 + libpng16-16 libjpeg-turbo8 libexpat1 libglib2.0 libgif7 libexif12 libvpx6 " apt_install() { @@ -71,10 +70,10 @@ install_ruby() { } cleanup() { - apt-get purge -y $COMMON_BUILD_DEPS $RUBY_BUILD_DEPS $VIPS_BUILD_DEPS $FFMPEG_BUILD_DEPS + apt-get purge -y $RUBY_BUILD_DEPS $VIPS_BUILD_DEPS $FFMPEG_BUILD_DEPS apt-get purge -y --allow-remove-essential \ - e2fsprogs git libglib2.0-bin libglib2.0-doc mount perl-modules-5.30 procps \ - python3 readline-common shared-mime-info tzdata + build-essential pkg-config e2fsprogs git libglib2.0-bin libglib2.0-doc \ + mount perl-modules-5.30 procps python3 readline-common shared-mime-info tzdata apt-get autoremove -y rm -rf \