Merge pull request #25 from techroy23/patch-1

Update README.md

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 ENV TZ=US/Eastern
@@ -10,7 +10,7 @@ RUN apt-get install sudo curl git nodejs npm jq apache2 wget apt-utils -y
 
 RUN curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
 
-RUN git clone --recurse-submodules https://github.com/begleysm/quakejs.git
+RUN git clone https://github.com/nerosketch/quakejs.git
 WORKDIR /quakejs
 RUN npm install
 RUN ls
@@ -25,8 +25,6 @@ RUN rm /var/www/html/index.html && cp /quakejs/html/* /var/www/html/
 COPY ./include/assets/ /var/www/html/assets
 RUN ls /var/www/html
 
-RUN echo "127.0.0.1 content.quakejs.com" >> /etc/hosts
-
 WORKDIR /
 ADD entrypoint.sh /entrypoint.sh
 # Was having issues with Linux and Windows compatibility with chmod -x, but this seems to work in both

README.md

@@ -5,9 +5,6 @@
 
 ![Docker Image CI](https://github.com/treyyoder/quakejs-docker/workflows/Docker%20Image%20CI/badge.svg)
 </div>
-:warning: 4/22/2020 Fixed a bug that was preventing other maps from loading.  Pull the lastest image from Docker Hub.
-
-:warning: 4/20/2020 Issues with entrypoint permissions and the refresh loop have been addressed.  Pull the lastest image from Docker Hub.
 
 ### A fully local and Dockerized quakejs server. Independent, unadulterated, and free from the middleman.  
 
@@ -21,13 +18,13 @@ docker pull treyyoder/quakejs:latest
 #### and run it:
 
 ```
-docker run -d --name quakejs -e HTTP_PORT=<HTTP_PORT> -p <HTTP_PORT>:80 -p 27960:27960 treyyoder/quakejs:latest
+docker run -d --name quakejs -e SERVER=<YOUR-IP-ADDRESS> -e HTTP_PORT=<HTTP_PORT> -p <HTTP_PORT>:80 -p 27960:27960 treyyoder/quakejs:latest
 ```
 
 #### Example:
 
 ```
-docker run -d --name quakejs -e HTTP_PORT=8080 -p 8080:80 -p 27960:27960 treyyoder/quakejs:latest
+docker run -d --name quakejs -e SERVER=0.0.0.0 -e HTTP_PORT=8080 -p 8080:80 -p 27960:27960 treyyoder/quakejs:latest
 ```
 
 Send all you friends/coworkers the link: ex. http://localhost:8080 and start fragging ;)
@@ -49,6 +46,12 @@ services:
         image: 'treyyoder/quakejs:latest'
 ```
 
+#### Building the Image
+After pulling the repo, change both `Dockerfile` and `entrypoint.sh` from CRLF to LF.
+
+Build the image with:
+
+`docker build --add-host=content.quakejs.com:127.0.0.1 -t treyyoder/quakejs:latest .`
 
 ## Credits:
 

docker-compose.yml

@@ -0,0 +1,10 @@
+version: '2'
+services:
+    quakejs:
+        container_name: quakejs
+        environment:
+            - HTTP_PORT=8080
+        ports:
+            - '8080:80'
+            - '27960:27960'
+        image: 'treyyoder/quakejs:latest'

entrypoint.sh

@@ -10,4 +10,4 @@ sed -i "s/':80'/':${HTTP_PORT}'/g" index.html
 
 cd /quakejs
 
-node build/ioq3ded.js +set fs_game baseq3 set dedicated 1 +exec server.cfg
+node build/ioq3ded.js +set fs_game baseq3 +set dedicated 1 +set fs_cdn 127.0.0.1 +exec server.cfg