diff --git a/Dockerfile b/Dockerfile index b31aab3..4b34a6f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,6 +47,10 @@ RUN npm upgrade && npm install WORKDIR /website/client COPY /client/package*json /website/client/ RUN npm upgrade && npm install +COPY /server /website/server + +WORKDIR /website/server +RUN npm upgrade && npm install COPY /config/default.json /website/config/default.json COPY /*js /website/ @@ -54,7 +58,6 @@ COPY /src /website/src COPY /client/public /website/client/public COPY /client/src /website/client/src COPY /scanner /website/scanner -COPY /server /website/server COPY /frontend /website/frontend COPY /ketrface /website/ketrface diff --git a/entrypoint.sh b/entrypoint.sh index af44aca..fb73429 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -3,6 +3,11 @@ if [[ "${TARGET_PORT}" != "" ]]; then sed -i -e "s,8123,${TARGET_PORT},g" /etc/nginx/sites-enabled/default fi +if [[ "${BASE_PATH}" != "" ]]; then + sed -i -e "s,/ident,${BASE_PATH}/ident,g" \ + /etc/nginx/snippets/active.location +fi + /usr/sbin/nginx mkdir -p /var/lib/shellinabox