Skip to content

Commit

Permalink
Update container and create image using chartpress
Browse files Browse the repository at this point in the history
  • Loading branch information
Rub21 committed Feb 20, 2024
1 parent f1d13ac commit 2e9b5a8
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 11 deletions.
4 changes: 3 additions & 1 deletion chartpress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,6 @@ charts:
valuesPath: osmchaWeb.image
osmcha-db:
valuesPath: osmchaDb.image

planet-files:
valuesPath: planetFiles.image

1 change: 0 additions & 1 deletion compose/planet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
15 changes: 9 additions & 6 deletions images/planet-files/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
15 changes: 12 additions & 3 deletions osm-seed/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -754,15 +754,15 @@ changesetReplicationJob:
# Variables for osmcha web builder
# ====================================================================================================
osmchaWeb:
enabled: true
enabled: false
image:
name: ""
tag: ""
# ====================================================================================================
# Variables for osmcha Api
# ====================================================================================================
osmchaApi:
enabled: true
enabled: false
image:
name: "ghcr.io/willemarcel/osmcha-django"
tag: "10d7f6748d9e55d439339ed2c35509db15f782a6"
Expand Down Expand Up @@ -803,7 +803,7 @@ osmchaApi:
# Variables for osmcha DB
# ====================================================================================================
osmchaDb:
enabled: true
enabled: false
image:
name: ""
tag: ""
Expand Down Expand Up @@ -834,3 +834,12 @@ osmchaDb:
GCP_gcePersistentDisk_size: 50Gi
nodeSelector:
enabled: false

# ====================================================================================================
# Planet server files
# ====================================================================================================
planetFiles:
enabled: false
image:
name: ""
tag: ""

0 comments on commit 2e9b5a8

Please sign in to comment.