fixes
This commit is contained in:
+6
-5
@@ -1,4 +1,4 @@
|
||||
FROM ubuntu:latest
|
||||
FROM ubuntu:20.04
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
ENV TZ=US/Eastern
|
||||
@@ -10,7 +10,8 @@ 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 --recurse-submodules https://github.com/begleysm/quakejs.git
|
||||
RUN git clone --branch fix_module https://github.com/nerosketch/quakejs.git
|
||||
WORKDIR /quakejs
|
||||
RUN npm install
|
||||
RUN ls
|
||||
@@ -25,11 +26,11 @@ 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
|
||||
#RUN cat /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
|
||||
RUN chmod 777 ./entrypoint.sh
|
||||
RUN chmod 777 entrypoint.sh
|
||||
|
||||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
ENTRYPOINT ["./entrypoint.sh"]
|
||||
|
||||
+2
-8
@@ -1,13 +1,7 @@
|
||||
#!/bin/sh
|
||||
|
||||
cd /var/www/html
|
||||
|
||||
sed -i "s/'quakejs:/window.location.hostname + ':/g" index.html
|
||||
|
||||
sed -i "s/':80'/':${HTTP_PORT}'/g" index.html
|
||||
|
||||
sed -i "s/quakejs/${SERVER}/g" index.html
|
||||
sed -i "s/${SERVER}:80/${SERVER}:${HTTP_PORT}/g" index.html
|
||||
/etc/init.d/apache2 start
|
||||
|
||||
cd /quakejs
|
||||
|
||||
node build/ioq3ded.js +set fs_game baseq3 set dedicated 1 +exec server.cfg
|
||||
|
||||
Reference in New Issue
Block a user