diff --git a/docker-compose.yaml b/docker-compose.yaml index a4381e4..9e1425f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -4,7 +4,7 @@ services: content: build: content/ ports: - - "8080:8080" + - "9999:8080" server: build: server/ ports: @@ -13,18 +13,20 @@ services: depends_on: - content - server - build: client/ + #build: client/ + image: nginxinc/nginx-unprivileged ports: - - "9999:8080" + - "8080:8080" environment: - - "QUAKEJS_CONTENT_URL=172.69.0.1:8080" - - "QUAKEJS_SERVER_URL=172.69.0.1:8888" + - "QUAKEJS_SERVER_URL=172.16.69.1:8888" + - "QUAKEJS_CONTENT_URL=172.16.69.1:9999" # Prevent subnet conflict with OpenVPN # Can connect to services via 172.69.0.1:PORT +# NOTE: localhost:8080 will no longer work networks: default: ipam: driver: default config: - - subnet: 172.69.0.0/16 + - subnet: 172.16.69.0/16 diff --git a/server/Dockerfile b/server/Dockerfile index 5fc6a36..7244aa4 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -1,6 +1,7 @@ -FROM node:16-alpine +FROM node:18-alpine -# Read the README...it's important (TL;DR: quakejs is .gitignore'd) +# Read the README, it's important +# (TL;DR: quakejs is .gitignore'd, you will need to build the assets) COPY quakejs /srv/quakejs COPY server.cfg.template /srv/server.cfg.template diff --git a/server/README.md b/server/README.md index b93b312..c989a45 100644 --- a/server/README.md +++ b/server/README.md @@ -3,17 +3,28 @@ ## Building quakejs and assets ``` -git clone --recurse-submodules https://github.com/glennhartmann/quakejs.git +# Clone quakejs (using fork because it's newer) +git clone --depth=1 https://github.com/glennhartmann/quakejs.git +# Build ioq3 (git submodules was failing for me) cd quakejs +rm -rf ioq3 +git clone https://github.com/begleysm/ioq3.git +cd ioq3 +git reset --hard 4f7d7bf2159aa0a18b79bb417aa760abac817b2a +rm -rf .git +cd ../ + +# Build assets npm install +npm audit fix --force # Optional node build/ioq3ded.js +set fs_game baseq3 +set dedicated 1 -# Hold down/press enter until you see `Agreee? (y/n)` +# Hold down enter until you see `Agree? (y/n)` # You read the EULA right? Right!?!...if so...enter `y` -# Then use ctrl+c to end the server +# Then use ctrl+c to end the server when you see "Opening IP socket" ``` > If the date of the last commit in the above quakejs GitHub repo is after -> 2020-06-09, let Jerry know, he will be amused. Email: me@jerryaldrichiii.com +> 2020-09-14, let Jerry know, he will be amused. Email: me@jerryaldrichiii.com After doing the above, `cd ..` then build the Docker image as you usually would