about summary refs log tree commit diff
path: root/Dockerfile
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-02-03 10:27:07 +0100
committerGitHub <noreply@github.com>2020-02-03 10:27:07 +0100
commit94cdbc4982bde9709a633d26ff9a083dd9661258 (patch)
tree66a2d3ef757eb5f7ed7b57a7dc215e77c0a18e97 /Dockerfile
parent4cd2d13bd226c005317adf9848f4c0316401b2ff (diff)
parent3dcb279da31bc7810b7f58991dad4f886aaade34 (diff)
Merge pull request #1274 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index cc75bd6be..16618a276 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,7 +58,9 @@ RUN npm install -g yarn && \
 COPY Gemfile* package.json yarn.lock /opt/mastodon/
 
 RUN cd /opt/mastodon && \
-	bundle install -j$(nproc) --deployment --without development test && \
+  bundle config set deployment 'true' && \
+  bundle config set without 'development test' && \
+	bundle install -j$(nproc) && \
 	yarn install --pure-lockfile
 
 FROM ubuntu:18.04