diff --git a/Dockerfile b/Dockerfile index 0d33e31..48ddebd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM nginx:latest COPY dist/inspect-app/ /usr/share/nginx/html -COPY config/nginx.conf /etc/nginx/nginx.conf -COPY config/config.sh /usr/local/bin/config.sh -COPY config/config-env.map /usr/local/bin/config-env.map -RUN chmod +x /usr/local/bin/config.sh +COPY docker/nginx.conf /etc/nginx/nginx.conf +COPY docker/rungnx.sh /usr/local/bin/rungnx.sh +COPY docker/config-env.map /usr/local/bin/config-env.map +RUN chmod +x /usr/local/bin/rungnx.sh EXPOSE 80 -ENTRYPOINT ["/bin/sh", "-c", "/usr/local/bin/config.sh /usr/share/nginx/html/environment.remote.json && nginx"] \ No newline at end of file +ENTRYPOINT ["rungnx.sh"] \ No newline at end of file diff --git a/config/config-env.map b/docker/config-env.map similarity index 92% rename from config/config-env.map rename to docker/config-env.map index 38c6c8a..b1ee8be 100644 --- a/config/config-env.map +++ b/docker/config-env.map @@ -1,5 +1,4 @@ host:INSPECT_SERVER_URL -home:PATH defaultEnv:DEFAULT_ENV gridViewPeriod:DEFAULT_GRID_VIEW_PERIOD kpiViewPeriod:DEFAULT_KPI_VIEW_PERIOD \ No newline at end of file diff --git a/config/nginx.conf b/docker/nginx.conf similarity index 100% rename from config/nginx.conf rename to docker/nginx.conf diff --git a/config/config.sh b/docker/rungnx.sh similarity index 87% rename from config/config.sh rename to docker/rungnx.sh index 10ecc6f..83d3fad 100644 --- a/config/config.sh +++ b/docker/rungnx.sh @@ -1,5 +1,5 @@ #!/bin/sh - +echo environment configuration ... OUT=${1:-"environment.remote.json"} DIR=$(dirname "$0") @@ -22,4 +22,6 @@ fi JSON="{$ENTRIES}" -echo "$JSON" > "$OUT" \ No newline at end of file +echo "$JSON" > "$OUT" + +nginx \ No newline at end of file diff --git a/package.json b/package.json index a23380a..491fad1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "inspect-app", - "version": "15.10.0", + "version": "15.11.0", "scripts": { "ng": "ng", "start": "ng serve",