Skip to content

Commit 76cd0d8

Browse files
staaldraadsamrose
staaldraad
and
samrose
authored
chore: update docker images (#2091)
* chore: update docker images * chore: bump to release --------- Co-authored-by: Sam Rose <samuel@supabase.io>
1 parent c53966c commit 76cd0d8

6 files changed

Lines changed: 69 additions & 64 deletions

File tree

‎Dockerfile-15‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
####################
55
# Stage 1: Nix builder
66
####################
7-
FROM alpine:3.21 AS nix-builder
7+
FROM alpine:3.23 AS nix-builder
88

99
# Install dependencies for nix installer (coreutils for GNU cp, sudo for installer)
1010
RUN apk add --no-cache \
@@ -48,27 +48,28 @@ RUN nix store gc
4848
####################
4949
# Stage 2: Gosu builder
5050
####################
51-
FROM alpine:3.21 AS gosu-builder
51+
FROM alpine:3.23 AS gosu-builder
5252

5353
ARG TARGETARCH
54-
ARG GOSU_VERSION=1.16
55-
56-
RUN apk add --no-cache gnupg curl
57-
58-
# Download and verify gosu
59-
RUN curl -fsSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}" -o /usr/local/bin/gosu && \
60-
curl -fsSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}.asc" -o /usr/local/bin/gosu.asc && \
61-
GNUPGHOME="$(mktemp -d)" && \
62-
export GNUPGHOME && \
63-
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
64-
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
65-
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
54+
ARG GOSU_VERSION=1.19
55+
ARG GO_VERSION=1.26.1
56+
57+
RUN apk add --no-cache curl git
58+
59+
# Install Go
60+
RUN curl -fsSL "https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz" | tar -C /usr/local -xz
61+
ENV PATH="/usr/local/go/bin:${PATH}"
62+
63+
# Build gosu from source
64+
RUN git clone --depth 1 --branch "${GOSU_VERSION}" https://github.com/tianon/gosu.git /gosu && \
65+
cd /gosu && \
66+
CGO_ENABLED=0 go build -ldflags="-s -w" -o /usr/local/bin/gosu . && \
6667
chmod +x /usr/local/bin/gosu
6768

6869
####################
6970
# Stage 3: Final production image
7071
####################
71-
FROM alpine:3.21 AS production
72+
FROM alpine:3.23 AS production
7273

7374
# Install minimal runtime dependencies
7475
RUN apk add --no-cache \
@@ -154,7 +155,7 @@ COPY ansible/files/stat_extension.sql /docker-entrypoint-initdb.d/migrations/00-
154155

155156
# Add entrypoint script
156157
ADD --chmod=0755 \
157-
https://github.com/docker-library/postgres/raw/889f9447cd2dfe21cccfbe9bb7945e3b037e02d8/15/bullseye/docker-entrypoint.sh \
158+
https://raw.githubusercontent.com/docker-library/postgres/6edb0a8c4def40c371514b34aef9037ec82d9110/15/alpine3.23/docker-entrypoint.sh \
158159
/usr/local/bin/docker-entrypoint.sh
159160

160161
# Setup pgsodium key script

‎Dockerfile-17‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
####################
55
# Stage 1: Nix builder
66
####################
7-
FROM alpine:3.21 AS nix-builder
7+
FROM alpine:3.23 AS nix-builder
88

99
# Install dependencies for nix installer (coreutils for GNU cp, sudo for installer)
1010
RUN apk add --no-cache \
@@ -49,27 +49,28 @@ RUN nix store gc
4949
####################
5050
# Stage 2: Gosu builder
5151
####################
52-
FROM alpine:3.21 AS gosu-builder
52+
FROM alpine:3.23 AS gosu-builder
5353

5454
ARG TARGETARCH
55-
ARG GOSU_VERSION=1.16
56-
57-
RUN apk add --no-cache gnupg curl
58-
59-
# Download and verify gosu
60-
RUN curl -fsSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}" -o /usr/local/bin/gosu && \
61-
curl -fsSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}.asc" -o /usr/local/bin/gosu.asc && \
62-
GNUPGHOME="$(mktemp -d)" && \
63-
export GNUPGHOME && \
64-
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
65-
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
66-
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
55+
ARG GOSU_VERSION=1.19
56+
ARG GO_VERSION=1.26.1
57+
58+
RUN apk add --no-cache curl git
59+
60+
# Install Go
61+
RUN curl -fsSL "https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz" | tar -C /usr/local -xz
62+
ENV PATH="/usr/local/go/bin:${PATH}"
63+
64+
# Build gosu from source
65+
RUN git clone --depth 1 --branch "${GOSU_VERSION}" https://github.com/tianon/gosu.git /gosu && \
66+
cd /gosu && \
67+
CGO_ENABLED=0 go build -ldflags="-s -w" -o /usr/local/bin/gosu . && \
6768
chmod +x /usr/local/bin/gosu
6869

6970
####################
7071
# Stage 3: Final production image
7172
####################
72-
FROM alpine:3.21 AS production
73+
FROM alpine:3.23 AS production
7374

7475
# Install minimal runtime dependencies
7576
RUN apk add --no-cache \
@@ -160,7 +161,7 @@ COPY ansible/files/stat_extension.sql /docker-entrypoint-initdb.d/migrations/00-
160161

161162
# Add entrypoint script
162163
ADD --chmod=0755 \
163-
https://github.com/docker-library/postgres/raw/889f9447cd2dfe21cccfbe9bb7945e3b037e02d8/17/bullseye/docker-entrypoint.sh \
164+
https://raw.githubusercontent.com/docker-library/postgres/6edb0a8c4def40c371514b34aef9037ec82d9110/17/alpine3.23/docker-entrypoint.sh \
164165
/usr/local/bin/docker-entrypoint.sh
165166

166167
# Setup pgsodium key script

‎Dockerfile-kubernetes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.22
1+
FROM alpine:3.23
22

33
ADD ./output-cloudimg/packer-cloudimg /disk/image.qcow2
44

‎Dockerfile-multigres‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
####################
99
# Stage 0: Nix base — shared Alpine + Nix setup for all builders
1010
####################
11-
FROM alpine:3.21 AS nix-base
11+
FROM alpine:3.23 AS nix-base
1212

1313
RUN apk add --no-cache \
1414
bash \
@@ -68,27 +68,29 @@ RUN nix store gc
6868
####################
6969
# Stage 2: Gosu builder
7070
####################
71-
FROM alpine:3.21 AS gosu-builder
71+
FROM alpine:3.23 AS gosu-builder
7272

7373
ARG TARGETARCH
74-
ARG GOSU_VERSION=1.16
74+
ARG GOSU_VERSION=1.19
75+
ARG GO_VERSION=1.26.1
7576

76-
RUN apk add --no-cache gnupg curl
77+
RUN apk add --no-cache curl git
7778

78-
RUN curl -fsSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}" -o /usr/local/bin/gosu && \
79-
curl -fsSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}.asc" -o /usr/local/bin/gosu.asc && \
80-
GNUPGHOME="$(mktemp -d)" && \
81-
export GNUPGHOME && \
82-
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
83-
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
84-
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
79+
# Install Go
80+
RUN curl -fsSL "https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz" | tar -C /usr/local -xz
81+
ENV PATH="/usr/local/go/bin:${PATH}"
82+
83+
# Build gosu from source
84+
RUN git clone --depth 1 --branch "${GOSU_VERSION}" https://github.com/tianon/gosu.git /gosu && \
85+
cd /gosu && \
86+
CGO_ENABLED=0 go build -ldflags="-s -w" -o /usr/local/bin/gosu . && \
8587
chmod +x /usr/local/bin/gosu
8688

8789
####################
8890
# Stage 3: Shared base — runtime Alpine + config + migrations
8991
# Both variants inherit from this stage. No /nix dependency here.
9092
####################
91-
FROM alpine:3.21 AS base
93+
FROM alpine:3.23 AS base
9294

9395
RUN apk add --no-cache \
9496
bash \

‎Dockerfile-orioledb-17‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
####################
55
# Stage 1: Nix builder
66
####################
7-
FROM alpine:3.21 AS nix-builder
7+
FROM alpine:3.23 AS nix-builder
88

99
# Install dependencies for nix installer (coreutils for GNU cp, sudo for installer)
1010
RUN apk add --no-cache \
@@ -49,27 +49,28 @@ RUN nix store gc
4949
####################
5050
# Stage 2: Gosu builder
5151
####################
52-
FROM alpine:3.21 AS gosu-builder
52+
FROM alpine:3.23 AS gosu-builder
5353

5454
ARG TARGETARCH
55-
ARG GOSU_VERSION=1.16
56-
57-
RUN apk add --no-cache gnupg curl
58-
59-
# Download and verify gosu
60-
RUN curl -fsSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}" -o /usr/local/bin/gosu && \
61-
curl -fsSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}.asc" -o /usr/local/bin/gosu.asc && \
62-
GNUPGHOME="$(mktemp -d)" && \
63-
export GNUPGHOME && \
64-
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
65-
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
66-
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
55+
ARG GOSU_VERSION=1.19
56+
ARG GO_VERSION=1.26.1
57+
58+
RUN apk add --no-cache curl git
59+
60+
# Install Go
61+
RUN curl -fsSL "https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz" | tar -C /usr/local -xz
62+
ENV PATH="/usr/local/go/bin:${PATH}"
63+
64+
# Build gosu from source
65+
RUN git clone --depth 1 --branch "${GOSU_VERSION}" https://github.com/tianon/gosu.git /gosu && \
66+
cd /gosu && \
67+
CGO_ENABLED=0 go build -ldflags="-s -w" -o /usr/local/bin/gosu . && \
6768
chmod +x /usr/local/bin/gosu
6869

6970
####################
7071
# Stage 3: Final production image
7172
####################
72-
FROM alpine:3.21 AS production
73+
FROM alpine:3.23 AS production
7374

7475
# Install minimal runtime dependencies
7576
RUN apk add --no-cache \
@@ -168,7 +169,7 @@ RUN echo "CREATE EXTENSION orioledb;" > /docker-entrypoint-initdb.d/init-scripts
168169

169170
# Add entrypoint script
170171
ADD --chmod=0755 \
171-
https://github.com/docker-library/postgres/raw/889f9447cd2dfe21cccfbe9bb7945e3b037e02d8/17/bullseye/docker-entrypoint.sh \
172+
https://raw.githubusercontent.com/docker-library/postgres/6edb0a8c4def40c371514b34aef9037ec82d9110/17/alpine3.23/docker-entrypoint.sh \
172173
/usr/local/bin/docker-entrypoint.sh
173174

174175
# Setup pgsodium key script

‎ansible/vars.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ postgres_major:
1010

1111
# Full version strings for each major version
1212
postgres_release:
13-
postgresorioledb-17: "17.6.0.057-orioledb"
14-
postgres17: "17.6.1.100"
15-
postgres15: "15.14.1.100"
13+
postgresorioledb-17: "17.6.0.058-orioledb"
14+
postgres17: "17.6.1.101"
15+
postgres15: "15.14.1.101"
1616

1717
# Non Postgres Extensions
1818
pgbouncer_release: 1.25.1

0 commit comments

Comments
 (0)