diff options
| author | Madeline <46743919+MaddyUnderStars@users.noreply.github.com> | 2022-08-30 15:05:23 +1000 |
|---|---|---|
| committer | Madeline <46743919+MaddyUnderStars@users.noreply.github.com> | 2022-08-30 15:08:18 +1000 |
| commit | 16315a3170ec018a834e68360e06b506415446d2 (patch) | |
| tree | 90cfe456040fce35b904e88462886e3c73a2f3f2 /Dockerfile | |
| parent | Start listening after database and config has been loaded (diff) | |
| parent | Oop, deprecated typeorm call (diff) | |
| download | server-16315a3170ec018a834e68360e06b506415446d2.tar.xz | |
Merge branch 'staging' into dev/Maddy/fix/listeningAfterDb
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/Dockerfile b/Dockerfile index 3c8a0b31..64130e51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,6 @@ FROM node:alpine # env vars -ENV WORK_DIR="/srv/fosscord-server" -ENV DEV_MODE=0 ENV HTTP_PORT=3001 ENV WS_PORT=3002 ENV CDN_PORT=3003 @@ -13,28 +11,12 @@ ENV ADMIN_PORT=3005 EXPOSE ${HTTP_PORT}/tcp ${WS_PORT}/tcp ${CDN_PORT}/tcp ${RTC_PORT}/tcp ${ADMIN_PORT}/tcp # install required apps -RUN apk add --no-cache --update git python2 py-pip make build-base +RUN apk add --no-cache --update git python3 py-pip make build-base +RUN ln -s /usr/bin/python3 /usr/bin/python -# optionl: packages for debugging/development -RUN apk add --no-cache sqlite +# Run as non-root user +# RUN adduser -D fosscord +# USER fosscord -# download fosscord-server -WORKDIR $WORK_DIR/src -RUN git clone https://github.com/fosscord/fosscord-server.git . - -# setup and run -WORKDIR $WORK_DIR/src/bundle -RUN npm run setup -RUN npm install @yukikaze-bot/erlpack -# RUN npm install mysql --save - -# create update script -RUN printf '#!/bin/sh\n\ngit -C $WORK_DIR/src/ checkout master\ngit -C $WORK_DIR/src/ reset --hard HEAD\ngit -C $WORK_DIR/src/ pull\ncd $WORK_DIR/src/bundle/\nnpm run setup\n' > $WORK_DIR/update.sh -RUN chmod +x $WORK_DIR/update.sh - -# configure entrypoint file -RUN printf '#!/bin/sh\n\nDEV_MODE=${DEV_MODE:-0}\n\nif [ "$DEV_MODE" -eq 1 ]; then\n tail -f /dev/null\nelse\n cd $WORK_DIR/src/bundle/\n npm run start:bundle\nfi\n' > $WORK_DIR/entrypoint.sh -RUN chmod +x $WORK_DIR/entrypoint.sh - -WORKDIR $WORK_DIR -ENTRYPOINT ["./entrypoint.sh"] +WORKDIR /srv/fosscord-server/bundle +ENTRYPOINT ["npm", "run", "start:bundle"] \ No newline at end of file |