Merge pull request #11 from linuxserver/cleanup-main

This commit is contained in:
Adam 2022-11-15 15:26:48 +00:00 committed by GitHub
commit 99d12e3f4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 5 deletions

View file

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

View file

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

View file

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

View file

@ -2,7 +2,7 @@
# shellcheck shell=bash # shellcheck shell=bash
RAILS_ENV=production RAILS_ENV=production
PATH="${PATH}:/opt/ruby/bin:/opt/node/bin:/app/www/bin" PATH="${PATH}:/app/www/bin"
RAILS_SERVE_STATIC_FILES=false RAILS_SERVE_STATIC_FILES=false
exec \ exec \

View file

@ -2,7 +2,7 @@
# shellcheck shell=bash # shellcheck shell=bash
RAILS_ENV=production RAILS_ENV=production
PATH="${PATH}:/opt/ruby/bin:/opt/node/bin:/app/www/bin" PATH="${PATH}:/app/www/bin"
cd /app/www || exit 1 cd /app/www || exit 1

View file

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