Adding includes to prevent the necessity of downloading them during the build; Fixed issue #2 and #3

Dockerfile

@@ -1,4 +1,26 @@
-FROM treyyoder/quakejs:latest
+FROM ubuntu:latest
+
+RUN apt-get update
+RUN apt-get upgrade -y
+
+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
+WORKDIR /quakejs
+RUN npm install
+
+COPY server.cfg /quakejs/base/baseq3/server.cfg
+COPY server.cfg /quakejs/base/cpma/server.cfg
+# The two following lines are not necessary because we copy assets from include.  Leaving them here for continuity. 
+# WORKDIR /var/www/html
+# RUN bash /var/www/html/get_assets.sh
+COPY ./include/ioq3ded/ioq3ded.fixed.js /quakejs/build/ioq3ded.js
+COPY ./include/assets /var/www/html
+RUN rm /var/www/html/index.html && cp /quakejs/html/* /var/www/html/
+
+RUN echo "127.0.0.1 content.quakejs.com" >> /etc/hosts
 
 ADD entrypoint.sh /entrypoint.sh
 

entrypoint.sh

@@ -1,11 +1,10 @@
 #!/bin/sh
-echo '127.0.0.1 content.quakejs.com' >> /etc/hosts
 
 cd /var/www/html
 
-sed -i "s/10.0.0.2/${SERVER}/g" index.html
+sed -i "s/quakejs/${SERVER}/g" index.html
 
-sed -i "s/8085/${HTTP_PORT}/g" index.html
+sed -i "s/${SERVER}:80/${SERVER}:${HTTP_PORT}/g" index.html
 
 /etc/init.d/apache2 start
 

include/assets/manifest.json

@@ -0,0 +1,77 @@
+[
+  {
+    "name": "linuxq3ademo-1.11-6.x86.gz.sh",
+    "compressed": 49292197,
+    "checksum": 857908472
+  },
+  {
+    "name": "linuxq3apoint-1.32b-3.x86.run",
+    "compressed": 30914987,
+    "checksum": 296843703
+  },
+  {
+    "name": "baseq3/pak100.pk3",
+    "compressed": 16401505,
+    "checksum": 2388798635
+  },
+  {
+    "name": "baseq3/pak101.pk3",
+    "compressed": 2652817,
+    "checksum": 2206768903
+  },
+  {
+    "name": "baseq3/q3wctf1.pk3",
+    "compressed": 15557689,
+    "checksum": 1135392334
+  },
+  {
+    "name": "baseq3/q3wctf2.pk3",
+    "compressed": 5990026,
+    "checksum": 666818448
+  },
+  {
+    "name": "baseq3/q3wctf3.pk3",
+    "compressed": 11550643,
+    "checksum": 2615088517
+  },
+  {
+    "name": "baseq3/ra3map1.pk3",
+    "compressed": 21035105,
+    "checksum": 2172771419
+  },
+  {
+    "name": "baseq3/ra3map11.pk3",
+    "compressed": 15784213,
+    "checksum": 1839974602
+  },
+  {
+    "name": "baseq3/ra3map12.pk3",
+    "compressed": 4553250,
+    "checksum": 3836301663
+  },
+  {
+    "name": "baseq3/ztn3tourney1.pk3",
+    "compressed": 12905100,
+    "checksum": 382030820
+  },
+  {
+    "name": "cpma/cpm1a.pk3",
+    "compressed": 2225575,
+    "checksum": 2269543307
+  },
+  {
+    "name": "cpma/cpm22.pk3",
+    "compressed": 2825648,
+    "checksum": 3249209727
+  },
+  {
+    "name": "cpma/cpm3a.pk3",
+    "compressed": 3675781,
+    "checksum": 559604397
+  },
+  {
+    "name": "cpma/pak100.pk3",
+    "compressed": 6299786,
+    "checksum": 1787998258
+  }
+]

prebuild/Dockerfile

@@ -1,18 +0,0 @@
-FROM ubuntu:latest
-
-RUN apt update
-RUN apt upgrade -y
-
-RUN apt-get install sudo curl git nodejs npm -y
-
-RUN curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
-
-#RUN adduser quake
-#RUN usermod -aG sudo quake
-#USER quake
-
-RUN git clone --recurse-submodules https://github.com/begleysm/quakejs.git
-WORKDIR /quakejs
-
-RUN npm install
-RUN node build/ioq3ded.js +set fs_game baseq3 +set dedicated 1

prebuild/README.md

@@ -1,8 +0,0 @@
-Caution: Work in progress
------
-
-This will get you started on the build, but I didn't have time to figure out a way to accept the agreement automagically, so I finished the rest of the steps manually.
-
-You could run some of the later steps such as setting up apache2 before initializing the quakejs server to automate this a bit more.
-
-Once you have everything running, commit the container and use that as the base image in the main [Dockerfile](https://github.com/treyyoder/quakejs-docker/blob/master/Dockerfile)

server.cfg

@@ -0,0 +1,17 @@
+seta sv_hostname "quakejs"
+seta sv_maxclients 12
+seta g_motd "Welcome to the Local baseq3 QuakeJS Server"
+seta g_quadfactor 3
+seta g_gametype 0
+seta timelimit 15
+seta fraglimit 25
+seta g_weaponrespawn 3
+seta g_inactivity 3000
+seta g_forcerespawn 0
+seta rconpassword "quakejs"
+set d1 "map q3dm1 ; set nextmap vstr d2"
+set d2 "map q3dm2 ; set nextmap vstr d3"
+set d3 "map q3dm3 ; set nextmap vstr d4"
+set d4 "map q3dm4 ; set nextmap vstr d5"
+set d5 "map q3dm5 ; set nextmap vstr d1"
+vstr d1