Merge pull request #12 from linuxserver/cleanup-develop

linuxserver · Nov 15, 2022 · ace8ce1 · ace8ce1
2 parents 8ea7877 + e26b5ca
commit ace8ce1
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@ LABEL maintainer="TheSpad"
 
 ENV RAILS_ENV="production" \
     NODE_ENV="production" \
-    PATH="${PATH}:/opt/ruby/bin:/opt/node/bin:/app/www/bin"
+    PATH="${PATH}:/app/www/bin"
 
 RUN \
   apk add -U --upgrade --no-cache \

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -8,7 +8,7 @@ LABEL maintainer="TheSpad"
 
 ENV RAILS_ENV="production" \
     NODE_ENV="production" \
-    PATH="${PATH}:/opt/ruby/bin:/opt/node/bin:/app/www/bin"
+    PATH="${PATH}:/app/www/bin"
 
 RUN \
   apk add -U --upgrade --no-cache \

diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config
@@ -1,6 +1,9 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
+# Disable php-fpm service as Mastodon doesn't use it
+touch /etc/services.d/php-fpm/down
+
 mkdir -p \
     /app/www/tmp \
     /config/mastodon/public/system

diff --git a/root/etc/services.d/mastodon/run b/root/etc/services.d/mastodon/run
@@ -2,7 +2,7 @@
 # shellcheck shell=bash
 
 RAILS_ENV=production
-PATH="${PATH}:/opt/ruby/bin:/opt/node/bin:/app/www/bin"
+PATH="${PATH}:/app/www/bin"
 RAILS_SERVE_STATIC_FILES=false
 
 exec \

diff --git a/root/etc/services.d/sidekiq/run b/root/etc/services.d/sidekiq/run
@@ -2,7 +2,7 @@
 # shellcheck shell=bash
 
 RAILS_ENV=production
-PATH="${PATH}:/opt/ruby/bin:/opt/node/bin:/app/www/bin"
+PATH="${PATH}:/app/www/bin"
 
 cd /app/www || exit 1
 

diff --git a/root/etc/services.d/streaming/run b/root/etc/services.d/streaming/run
@@ -2,7 +2,7 @@
 # shellcheck shell=bash
 
 NODE_ENV=production
-PATH="${PATH}:/opt/ruby/bin:/opt/node/bin:/app/www/bin"
+PATH="${PATH}:/app/www/bin"
 
 exec \
     s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 4000" \