diff --git a/.bundle/config b/.bundle/config deleted file mode 100644 index b64ad2111..000000000 --- a/.bundle/config +++ /dev/null @@ -1,3 +0,0 @@ ---- -BUNDLE_BUILD__NOKOGIRI: "--use-system-libraries" -BUNDLE_BUILD__NOKOGUMBO: "--without-libxml2" diff --git a/config/docker/Dockerfile.danbooru b/config/docker/Dockerfile.danbooru index 6ed90d067..7d77b9292 100644 --- a/config/docker/Dockerfile.danbooru +++ b/config/docker/Dockerfile.danbooru @@ -26,7 +26,7 @@ ARG NODE_VERSION RUN \ apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - build-essential libpq-dev libvips-dev libxml2-dev libxslt-dev zlib1g-dev \ + build-essential libpq-dev libvips-dev zlib1g-dev \ curl ca-certificates dirmngr git gpg && \ rm -rf /var/lib/apt/lists/* @@ -36,7 +36,7 @@ RUN \ asdf global nodejs "$NODE_VERSION" && \ npm install --unsafe-perm=true -g yarn -COPY .bundle Gemfile Gemfile.lock ./ +COPY Gemfile Gemfile.lock ./ RUN \ bundle install --jobs "$(nproc)" && \ rm -rf "$(gem environment gemdir)/cache" && \ diff --git a/config/docker/build-base-image.sh b/config/docker/build-base-image.sh index 287a9c76f..f3a805596 100755 --- a/config/docker/build-base-image.sh +++ b/config/docker/build-base-image.sh @@ -16,7 +16,7 @@ VIPS_BUILD_DEPS=" libjpeg-turbo8-dev libexpat1-dev libglib2.0-dev libgif-dev libexif-dev " DANBOORU_RUNTIME_DEPS=" - ca-certificates mkvtoolnix postgresql-client-12 libpq5 libxml2 libxslt1.1 + ca-certificates mkvtoolnix postgresql-client-12 libpq5 zlib1g libfftw3-3 libwebp6 libwebpmux3 libwebpdemux2 liborc-0.4.0 liblcms2-2 libpng16-16 libjpeg-turbo8 libexpat1 libglib2.0 libgif7 libexif12 libvpx6 "