about summary refs log tree commit diff
path: root/Dockerfile
diff options
context:
space:
mode:
authorStarfall <root@starfall.blue>2019-12-09 19:17:41 -0600
committerStarfall <root@starfall.blue>2019-12-09 19:17:41 -0600
commit9ee65e89d547ae4a5bc0a5bdb59316ba5c061cfd (patch)
tree9bc6bee9f9b95ba51ea747502f6cd740d647850a /Dockerfile
parent6b34fcfef7566105e8d80ab5fee0a539c06cddbf (diff)
parent37a9551c3fe59dd1f50a363ce2532c5f00fdf228 (diff)
Merge branch 'production'
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile13
1 files changed, 9 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile
index f122f38f8..ccd916a49 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -112,13 +112,18 @@ ENV NODE_ENV="production"
 ENV RAILS_SERVE_STATIC_FILES="true"
 ENV BIND="0.0.0.0"
 
-# Set the run user
 USER mastodon
 
 # Precompile assets
-RUN cd ~ && \
-	OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder rails assets:precompile && \
-	yarn cache clean
+RUN cd ~ && OTP_SECRET=_ SECRET_KEY_BASE=_ rails assets:precompile --trace && yarn cache clean
+
+# Empty temporary files
+USER root
+
+RUN rm -rf /opt/mastodon/tmp/*
+
+# Set the run user
+USER mastodon
 
 # Set the work dir and the container entry point
 WORKDIR /opt/mastodon