From 58774788cfda03f86b3193192df5099f4b07c7b3 Mon Sep 17 00:00:00 2001 From: lbrinkhaus Date: Sun, 2 Jan 2022 20:14:35 +0100 Subject: [PATCH] Update APK Repositories to 3.15 --- 13/Dockerfile | 6 +----- 14/Dockerfile | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/13/Dockerfile b/13/Dockerfile index c02b34d..d8604f0 100644 --- a/13/Dockerfile +++ b/13/Dockerfile @@ -2,10 +2,6 @@ FROM harbor.dragse.it/base/alpine:3.15 RUN echo $'http://nexus.dragse.it/repository/apk-main/\nhttp://nexus.dragse.it/repository/apk-community/' > /etc/apk/repositories - RUN apk --no-cache upgrade \ - && apk --no-cache add ca-certificates wget openssl \ - && update-ca-certificates - # 70 is the standard uid/gid for "postgres" in Alpine # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable RUN set -eux; \ @@ -139,9 +135,9 @@ RUN set -eux; \ /usr/local/share/man \ ; \ \ - apk --no-cache update && apk --no-cache upgrade; \ postgres --version + # make the sample config easier to munge (and "correct by default") RUN set -eux; \ cp -v /usr/local/share/postgresql/postgresql.conf.sample /usr/local/share/postgresql/postgresql.conf.sample.orig; \ diff --git a/14/Dockerfile b/14/Dockerfile index 8ce29d0..adacaf4 100644 --- a/14/Dockerfile +++ b/14/Dockerfile @@ -2,10 +2,6 @@ FROM harbor.dragse.it/base/alpine:3.15 RUN echo $'http://nexus.dragse.it/repository/apk-main/\nhttp://nexus.dragse.it/repository/apk-community/' > /etc/apk/repositories - RUN apk --no-cache upgrade \ - && apk --no-cache add ca-certificates wget openssl \ - && update-ca-certificates - # 70 is the standard uid/gid for "postgres" in Alpine # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable RUN set -eux; \ @@ -158,7 +154,7 @@ ENV PGDATA /var/lib/postgresql/data RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" VOLUME /var/lib/postgresql/data -COPY 14/docker-entrypoint.sh /usr/local/bin/ +COPY docker-entrypoint.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/docker-entrypoint.sh ENTRYPOINT ["docker-entrypoint.sh"]