refactor(yukon): remove PUID/GUID

Although it works, it caused some problems if the docker image was not regenerated on each use. These values must be updated in runtime.
n0bodysec · Sep 29, 2022 · bf22a0b · bf22a0b
1 parent c474158
commit bf22a0b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 36 deletions.
diff --git a/yukon/.env.example b/yukon/.env.example
@@ -120,24 +120,3 @@ GAME_LOGIN_HOST=localhost
 GAME_LOGIN_PORT=6111
 GAME_BLIZZARD_HOST=localhost
 GAME_BLIZZARD_PORT=6112
-
-##############################################
-# Docker
-##############################################
-#
-# PUID
-# ----
-# The UID of the user who will run the server
-# Docker container. This is not needed for
-# Windows users.
-#
-# PGID
-# ----
-# The GID of the user who will run the server
-# Docker container. This is not needed for
-# Windows users.
-#
-##############################################
-
-PUID=1000
-PGID=1000
diff --git a/yukon/docker-compose.yml b/yukon/docker-compose.yml
@@ -21,11 +21,7 @@ services:
 
   server:
     image: yukon/server
-    build:
-      context: ./server
-      args:
-        PUID: ${PUID:-1000}
-        PGID: ${PGID:-1000}
+    build: ./server
     restart: unless-stopped
     # ports: [ '${GAME_LOGIN_PORT}:${GAME_LOGIN_PORT}', '${GAME_BLIZZARD_PORT}:${GAME_BLIZZARD_PORT}' ]
     networks: [ 'default', 'db' ]
@@ -87,8 +83,6 @@ services:
         wget -qO res.json https://api.github.com/repos/ruffle-rs/ruffle/releases
         node -p "require('./res.json').flatMap(x => x.assets).find(y => y.browser_download_url.includes('selfhosted')).browser_download_url;" | xargs -n1 wget -qO ruffle.zip
         unzip -d www/assets/scripts/lib/ruffle ruffle.zip
-        echo "Chowning all files..."
-        chown -R $$PUID:$$PGID *
 
 networks:
   db:

diff --git a/yukon/server/Dockerfile b/yukon/server/Dockerfile
@@ -2,20 +2,12 @@ FROM node:alpine
 
 # args & env
 ARG WAIT_FOR_VERSION=4df3f9262d84cab0039c07bf861045fbb3c20ab7
-ARG PUID=1000
-ARG PGID=1000
 ENV DOCKERIZE_VERSION=v0.6.1
 
-# setup non-root user
-RUN deluser --remove-home node && addgroup -S node -g ${PGID} && adduser -S -G node -u ${PUID} node
-
 # install dockerize
 RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
 	&& tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
 	&& rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
 
-# run as non-root user
-USER node
-
 WORKDIR /srv/server
 CMD ["npm", "run", "start"]