From 2abbeaa4a2c83fcb8bf5ed81a1790948b12cc401 Mon Sep 17 00:00:00 2001 From: Trey Yoder Date: Wed, 22 Apr 2020 00:17:31 -0400 Subject: [PATCH] Fixing refresh loop and an issue with entrypoint permissions. --- .gitignore | 1 + Dockerfile | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..559fa70 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +quakejsdocs \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 8b33699..a904955 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,18 +10,23 @@ 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 - +RUN ls 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. +# 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/ +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 +RUN chmod 777 ./entrypoint.sh ENTRYPOINT ["/entrypoint.sh"]