From 4833b8a63c794468b5e46d03c516f2055ccad231 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Wed, 14 Aug 2019 13:14:01 -0500
Subject: [PATCH] Fix the circleci build.

---
 config/docker/danbooru-base |  2 +-
 config/docker/danbooru-ci   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/config/docker/danbooru-base b/config/docker/danbooru-base
index 44e79230e..bab4b0794 100644
--- a/config/docker/danbooru-base
+++ b/config/docker/danbooru-base
@@ -1,4 +1,4 @@
-FROM ruby:2.6.3-slim-stretch
+FROM ruby:2.5.1-slim-stretch
 
 ENV DOCKERIZE_VERSION v0.6.1
 ENV VIPS_VERSION 8.7.0
diff --git a/config/docker/danbooru-ci b/config/docker/danbooru-ci
index c7e4b4fa4..b2780304c 100644
--- a/config/docker/danbooru-ci
+++ b/config/docker/danbooru-ci
@@ -4,6 +4,16 @@ FROM r888888888/danbooru-base
 
 ENV PATH $PATH:/usr/local/bin
 
+# Work around a bug in the ruby:2.5.1-slim-stretch base image. The base image
+# sets BUNDLER_VERSION=1.16.4, which forces `bundle install` to use an outdated
+# version even when we install a newer version. Remove this after updating the
+# base image.
+#
+# https://discuss.circleci.com/t/using-bundler-2-0-during-ci-fails/27411
+# https://github.com/bundler/bundler/issues/6782
+# https://github.com/docker-library/ruby/issues/246
+ENV BUNDLER_VERSION 2.0.2
+
 USER root
 COPY . /app
 RUN chown -R danbooru:danbooru /app
@@ -15,4 +25,5 @@ RUN sed -i'' -e 's/run -it/run -i/' /usr/local/bin/circleci
 
 USER danbooru
 RUN git reset --hard master
+RUN gem install bundler --version $BUNDLER_VERSION
 RUN bundle install > /dev/null