Fix the circleci build.

This commit is contained in:
evazion
2019-08-14 13:14:01 -05:00
parent e29e5fe984
commit 4833b8a63c
2 changed files with 12 additions and 1 deletions

View File

@@ -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

View File

@@ -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