Merge pull request #11 from linuxserver/cleanup-main
This commit is contained in:
commit
99d12e3f4a
6 changed files with 8 additions and 5 deletions
|
@ -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 \
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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" \
|
||||||
|
|
Loading…
Reference in a new issue