From b913c3fe0aa25a2ace89cb1d4b994e0167c9e9c1 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Tue, 13 Aug 2024 00:48:00 +0200
Subject: [PATCH] apk usage

---
 docker-compose.local.yml | 2 +-
 docker-compose.yml       | 5 +++--
 server/Dockerfile        | 2 +-
 webclient/Dockerfile     | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/docker-compose.local.yml b/docker-compose.local.yml
index e5af7627c..bb5a946bd 100644
--- a/docker-compose.local.yml
+++ b/docker-compose.local.yml
@@ -88,7 +88,7 @@ services:
       start_period: 20s
   osm-download-data:
     image: alpine:latest
-    command: sh -c "apk add wget && wget --continue --timestamping https://download.geofabrik.de/europe/germany/bayern/oberbayern-latest.osm.pbf"
+    command: sh -c "apk --update --quiet add wget && wget --continue --timestamping https://download.geofabrik.de/europe/germany/bayern/oberbayern-latest.osm.pbf"
     working_dir: /map/data
     volumes:
       - ./map/data/:/map/data/:rw
diff --git a/docker-compose.yml b/docker-compose.yml
index 737dcc0bd..2f5201743 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -188,10 +188,11 @@ services:
       test: [ "CMD", "pg_isready", "-U", "${POSTGRES_USER}" ]
       retries: 5
       interval: 10s
-      start_period: 10s
+      start_interval: 20s
+      start_period: 20s
   osm-download-data:
     image: alpine:latest
-    command: apk --update add wget && wget --continue --timestamping https://download.geofabrik.de/europe/germany-latest.osm.pbf
+    command: apk --update --quiet add wget && wget --continue --timestamping https://download.geofabrik.de/europe/germany-latest.osm.pbf
     working_dir: /map/data
     volumes:
       - ./map/data/:/map/data/:rw
diff --git a/server/Dockerfile b/server/Dockerfile
index 453213a38..1d6553b3a 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -9,7 +9,7 @@ FROM    rust:1.80-alpine AS compiler
 # - musl-dev is needed for musl to compile the binary
 # - mold is used to link faster
 # - I somehow could not get openssl to cooperate => we are contibuing with libpq-dev
-RUN     apk add -q --update-cache --no-cache musl-dev libpq-dev mold
+RUN     apk --update add -q --update-cache --no-cache musl-dev libpq-dev mold
 
 WORKDIR /compiler
 ENV     USER=root
diff --git a/webclient/Dockerfile b/webclient/Dockerfile
index 9ef5107ff..8cd946e83 100644
--- a/webclient/Dockerfile
+++ b/webclient/Dockerfile
@@ -27,7 +27,8 @@ RUN pnpm run build
 
 
 FROM node:21-alpine3.19 AS production-stage
-RUN apk update --no-progress --quiet && apk add curl --no-progress --quiet
+RUN apk update --no-progress --quiet && \
+    apk add --no-cache --no-progress --quiet curl
 
 COPY --from=build-stage /app/.output /app/.output
 COPY --from=build-stage /app/node_modules /app/node_modules