diff --git a/chartpress.yaml b/chartpress.yaml index f5af3ddc..388d0d44 100644 --- a/chartpress.yaml +++ b/chartpress.yaml @@ -46,4 +46,6 @@ charts: valuesPath: osmchaWeb.image osmcha-db: valuesPath: osmchaDb.image - \ No newline at end of file + planet-files: + valuesPath: planetFiles.image + diff --git a/compose/planet.yml b/compose/planet.yml index 29d26bf2..bb0e31c9 100644 --- a/compose/planet.yml +++ b/compose/planet.yml @@ -86,5 +86,4 @@ services: - '.../data/full-history-data:/usr/share/nginx/html/server/static-files/full-planet' - '../data/changeset-replication-job-data:/usr/share/nginx/html/server/static-files/changesets' # Development mode - # - ./../images/planet-files/server:/usr/share/nginx/html/server/ # - ./../images/planet-files/:/usr/share/nginx/html/ diff --git a/images/planet-files/Dockerfile b/images/planet-files/Dockerfile index 12576a23..4f9aa907 100644 --- a/images/planet-files/Dockerfile +++ b/images/planet-files/Dockerfile @@ -1,7 +1,10 @@ -FROM nginx -RUN apt-get update && apt-get install -y nodejs npm -COPY server/package.json /usr/share/nginx/html/server/ -RUN cd /usr/share/nginx/html/server && npm install -COPY server/server.js /usr/share/nginx/html/server/ +FROM nginx:latest +RUN apt-get update && \ + apt-get install -y nodejs npm && \ + rm -rf /var/lib/apt/lists/* +WORKDIR /usr/share/nginx/html/server/ +COPY server/package.json ./ +RUN npm install +COPY server/server.js ./ COPY index.html /usr/share/nginx/html/ -CMD ["sh", "-c", "nginx -g 'daemon off;' & cd /usr/share/nginx/html/server/ && node server.js"] +CMD ["sh", "-c", "nginx -g 'daemon off;' & node server.js"] diff --git a/osm-seed/values.yaml b/osm-seed/values.yaml index 4f4c5e79..b7a0519d 100644 --- a/osm-seed/values.yaml +++ b/osm-seed/values.yaml @@ -754,7 +754,7 @@ changesetReplicationJob: # Variables for osmcha web builder # ==================================================================================================== osmchaWeb: - enabled: true + enabled: false image: name: "" tag: "" @@ -762,7 +762,7 @@ osmchaWeb: # Variables for osmcha Api # ==================================================================================================== osmchaApi: - enabled: true + enabled: false image: name: "ghcr.io/willemarcel/osmcha-django" tag: "10d7f6748d9e55d439339ed2c35509db15f782a6" @@ -803,7 +803,7 @@ osmchaApi: # Variables for osmcha DB # ==================================================================================================== osmchaDb: - enabled: true + enabled: false image: name: "" tag: "" @@ -834,3 +834,12 @@ osmchaDb: GCP_gcePersistentDisk_size: 50Gi nodeSelector: enabled: false + +# ==================================================================================================== +# Planet server files +# ==================================================================================================== +planetFiles: + enabled: false + image: + name: "" + tag: ""