Browse Source

Update 'deploy/Dockerfile'

master
Maff 1 month ago
parent
commit
7434bb45ad
1 changed files with 10 additions and 1 deletions
  1. 10
    1
      deploy/Dockerfile

+ 10
- 1
deploy/Dockerfile View File

@@ -3,5 +3,14 @@ FROM tootsuite/mastodon:v$MASTODON_VERSION
3 3
 
4 4
 COPY queer.party.patch /
5 5
 COPY pressstart2p /mastodon/app/javascript/fonts/pressstart2p
6
-RUN cd /mastodon && patch -p1 < /queer.party.patch
6
+USER root
7
+#Seems like in v2.8.0 the official docker image no longer includes `patch`.
8
+RUN test -x /usr/bin/patch || sh -c 'mkdir -p /var/lib/apt/lists/partial && \
9
+	mkdir -p /var/cache/apt/archives/partial && \
10
+	apt update && \
11
+	apt install -y patch && \
12
+	apt-get clean -y && \
13
+	rm -rf /var/cache/apt/archives /var/lib/apt/lists'
14
+USER mastodon
15
+RUN cd /mastodon && /usr/bin/patch -p1 < /queer.party.patch
7 16
 RUN OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder bundle exec rails assets:precompile

Loading…
Cancel
Save