Skip to content

Commit

Permalink
Fix s6 layer
Browse files Browse the repository at this point in the history
  • Loading branch information
D4rk4 committed Feb 15, 2022
1 parent a1aa063 commit bc658f8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ RUN curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo -o /etc/yum.re
rpm --import https://dl.yarnpkg.com/rpm/pubkey.gpg && \
curl -fsSL https://rpm.nodesource.com/setup_${NODE_VERSION} | bash - && \
dnf update -y && \
dnf install -y nodejs yarn postgresql libpq wget git bash jq postgresql-devel tar gcc-c++ make xz && \
dnf module enable -y postgresql:10 && \
dnf install -y nodejs yarn postgresql-server libpq wget git bash jq postgresql-devel tar gcc-c++ make xz && \
mkdir -p /var/lib/zerotier-one/ && \
ln -s /app/config/authtoken.secret /var/lib/zerotier-one/authtoken.secret

Expand Down
2 changes: 1 addition & 1 deletion s6-files/etc/services.d/backend/run
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ ZU_DEFAULT_PASSWORD=$ZU_DEFAULT_PASSWORD
ZU_DATAPATH=$ZU_DATAPATH

cd /app/backend
NODE_ENV=${NODE_ENV} LISTEN_ADDRESS=${LISTEN_ADDRESS} ZU_SERVE_FRONTEND=${ZU_SERVE_FRONTEND} ZU_SECURE_HEADERS=${ZU_SECURE_HEADERS} ZU_CONTROLLER_ENDPOINT=${ZU_CONTROLLER_ENDPOINT} ZU_CONTROLLER_TOKEN=${ZU_CONTROLLER_TOKEN} ZU_DEFAULT_USERNAME=${ZU_DEFAULT_USERNAME} ZU_DEFAULT_PASSWORD=${ZU_DEFAULT_PASSWORD} /usr/local/bin/node /app/backend/bin/www
NODE_ENV=${NODE_ENV} LISTEN_ADDRESS=${LISTEN_ADDRESS} ZU_SERVE_FRONTEND=${ZU_SERVE_FRONTEND} ZU_SECURE_HEADERS=${ZU_SECURE_HEADERS} ZU_CONTROLLER_ENDPOINT=${ZU_CONTROLLER_ENDPOINT} ZU_CONTROLLER_TOKEN=${ZU_CONTROLLER_TOKEN} ZU_DEFAULT_USERNAME=${ZU_DEFAULT_USERNAME} ZU_DEFAULT_PASSWORD=${ZU_DEFAULT_PASSWORD} /usr/bin/node /app/backend/bin/www
2 changes: 1 addition & 1 deletion s6-files/etc/services.d/zerotier/run
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/command/with-contenv
#!/command/with-contenv bash

if [ -z "$ZT_PRIMARY_PORT" ]; then
ZT_PRIMARY_PORT=9993
Expand Down

0 comments on commit bc658f8

Please sign in to comment.