From 853becbcfcb3a7e8a793fea1ba664e4929a929f6 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Thu, 8 Aug 2019 00:37:34 -0500
Subject: [PATCH] circleci: try to fix the build.

---
 Gemfile                   | 1 +
 Gemfile.lock              | 4 ++++
 config/docker/danbooru-ci | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index a044e5d04..60191194c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -44,6 +44,7 @@ gem 'webpacker', '>= 4.0.x'
 gem 'retriable'
 gem 'redis'
 gem 'request_store'
+gem 'term-ansicolor', require: "term/ansicolor"
 
 # needed for looser jpeg header compat
 gem 'ruby-imagespec', :require => "image_spec", :git => "https://github.com/r888888888/ruby-imagespec.git", :branch => "exif-fixes"
diff --git a/Gemfile.lock b/Gemfile.lock
index 2eeed6a42..4078faa06 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -371,10 +371,13 @@ GEM
     stripe (4.21.3)
       faraday (~> 0.13)
       net-http-persistent (~> 3.0)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.9)
     timecop (0.9.1)
+    tins (1.21.1)
     twitter (6.2.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
@@ -483,6 +486,7 @@ DEPENDENCIES
   statistics2
   streamio-ffmpeg
   stripe
+  term-ansicolor
   timecop
   twitter
   unicorn
diff --git a/config/docker/danbooru-ci b/config/docker/danbooru-ci
index e2c11ddcf..c7e4b4fa4 100644
--- a/config/docker/danbooru-ci
+++ b/config/docker/danbooru-ci
@@ -6,7 +6,7 @@ ENV PATH $PATH:/usr/local/bin
 
 USER root
 COPY . /app
-RUN chown -R danbooru:danbooru public/ tmp/ config/ log/ db/
+RUN chown -R danbooru:danbooru /app
 
 # install circleci cli tools
 RUN curl -q -o /usr/local/bin/circleci https://circle-downloads.s3.amazonaws.com/releases/build_agent_wrapper/circleci
@@ -14,4 +14,5 @@ RUN chmod +x /usr/local/bin/circleci
 RUN sed -i'' -e 's/run -it/run -i/' /usr/local/bin/circleci
 
 USER danbooru
+RUN git reset --hard master
 RUN bundle install > /dev/null