Skip to content

chore: update docker images #2091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samrose merged 3 commits into from
Mar 22, 2026
+69 −64
Merged

chore: update docker images #2091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5b6e77
chore: update docker images
staaldraad Mar 19, 2026
3b7e32d
chore: bump to release
samrose Mar 20, 2026
7d68e13
Merge branch 'develop' into chore/bump-docker-images
staaldraad Mar 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions Dockerfile-15
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
####################
# Stage 1: Nix builder
####################
FROM alpine:3.21 AS nix-builder
FROM alpine:3.23 AS nix-builder

# Install dependencies for nix installer (coreutils for GNU cp, sudo for installer)
RUN apk add --no-cache \
Expand Down Expand Up @@ -48,27 +48,28 @@ RUN nix store gc
####################
# Stage 2: Gosu builder
####################
FROM alpine:3.21 AS gosu-builder
FROM alpine:3.23 AS gosu-builder

ARG TARGETARCH
ARG GOSU_VERSION=1.16

RUN apk add --no-cache gnupg curl

# Download and verify gosu
RUN curl -fsSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}" -o /usr/local/bin/gosu && \
curl -fsSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}.asc" -o /usr/local/bin/gosu.asc && \
GNUPGHOME="$(mktemp -d)" && \
export GNUPGHOME && \
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
ARG GOSU_VERSION=1.19
ARG GO_VERSION=1.26.1

RUN apk add --no-cache curl git

# Install Go
RUN curl -fsSL "https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz" | tar -C /usr/local -xz
ENV PATH="/usr/local/go/bin:${PATH}"

# Build gosu from source
RUN git clone --depth 1 --branch "${GOSU_VERSION}" https://github.com/tianon/gosu.git /gosu && \
cd /gosu && \
CGO_ENABLED=0 go build -ldflags="-s -w" -o /usr/local/bin/gosu . && \
chmod +x /usr/local/bin/gosu

####################
# Stage 3: Final production image
####################
FROM alpine:3.21 AS production
FROM alpine:3.23 AS production

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

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

# Setup pgsodium key script
Expand Down
33 changes: 17 additions & 16 deletions Dockerfile-17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
####################
# Stage 1: Nix builder
####################
FROM alpine:3.21 AS nix-builder
FROM alpine:3.23 AS nix-builder

# Install dependencies for nix installer (coreutils for GNU cp, sudo for installer)
RUN apk add --no-cache \
Expand Down Expand Up @@ -49,27 +49,28 @@ RUN nix store gc
####################
# Stage 2: Gosu builder
####################
FROM alpine:3.21 AS gosu-builder
FROM alpine:3.23 AS gosu-builder

ARG TARGETARCH
ARG GOSU_VERSION=1.16

RUN apk add --no-cache gnupg curl

# Download and verify gosu
RUN curl -fsSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}" -o /usr/local/bin/gosu && \
curl -fsSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}.asc" -o /usr/local/bin/gosu.asc && \
GNUPGHOME="$(mktemp -d)" && \
export GNUPGHOME && \
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
ARG GOSU_VERSION=1.19
ARG GO_VERSION=1.26.1

RUN apk add --no-cache curl git

# Install Go
RUN curl -fsSL "https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz" | tar -C /usr/local -xz
ENV PATH="/usr/local/go/bin:${PATH}"

# Build gosu from source
RUN git clone --depth 1 --branch "${GOSU_VERSION}" https://github.com/tianon/gosu.git /gosu && \
cd /gosu && \
CGO_ENABLED=0 go build -ldflags="-s -w" -o /usr/local/bin/gosu . && \
chmod +x /usr/local/bin/gosu

####################
# Stage 3: Final production image
####################
FROM alpine:3.21 AS production
FROM alpine:3.23 AS production

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

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

# Setup pgsodium key script
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-kubernetes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.22
FROM alpine:3.23

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

Expand Down
26 changes: 14 additions & 12 deletions Dockerfile-multigres
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
####################
# Stage 0: Nix base — shared Alpine + Nix setup for all builders
####################
FROM alpine:3.21 AS nix-base
FROM alpine:3.23 AS nix-base

RUN apk add --no-cache \
bash \
Expand Down Expand Up @@ -68,27 +68,29 @@ RUN nix store gc
####################
# Stage 2: Gosu builder
####################
FROM alpine:3.21 AS gosu-builder
FROM alpine:3.23 AS gosu-builder

ARG TARGETARCH
ARG GOSU_VERSION=1.16
ARG GOSU_VERSION=1.19
ARG GO_VERSION=1.26.1

RUN apk add --no-cache gnupg curl
RUN apk add --no-cache curl git

RUN curl -fsSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}" -o /usr/local/bin/gosu && \
curl -fsSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}.asc" -o /usr/local/bin/gosu.asc && \
GNUPGHOME="$(mktemp -d)" && \
export GNUPGHOME && \
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
# Install Go
RUN curl -fsSL "https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz" | tar -C /usr/local -xz
ENV PATH="/usr/local/go/bin:${PATH}"

# Build gosu from source
RUN git clone --depth 1 --branch "${GOSU_VERSION}" https://github.com/tianon/gosu.git /gosu && \
cd /gosu && \
CGO_ENABLED=0 go build -ldflags="-s -w" -o /usr/local/bin/gosu . && \
chmod +x /usr/local/bin/gosu

####################
# Stage 3: Shared base — runtime Alpine + config + migrations
# Both variants inherit from this stage. No /nix dependency here.
####################
FROM alpine:3.21 AS base
FROM alpine:3.23 AS base

RUN apk add --no-cache \
bash \
Expand Down
33 changes: 17 additions & 16 deletions Dockerfile-orioledb-17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
####################
# Stage 1: Nix builder
####################
FROM alpine:3.21 AS nix-builder
FROM alpine:3.23 AS nix-builder

# Install dependencies for nix installer (coreutils for GNU cp, sudo for installer)
RUN apk add --no-cache \
Expand Down Expand Up @@ -49,27 +49,28 @@ RUN nix store gc
####################
# Stage 2: Gosu builder
####################
FROM alpine:3.21 AS gosu-builder
FROM alpine:3.23 AS gosu-builder

ARG TARGETARCH
ARG GOSU_VERSION=1.16

RUN apk add --no-cache gnupg curl

# Download and verify gosu
RUN curl -fsSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}" -o /usr/local/bin/gosu && \
curl -fsSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}.asc" -o /usr/local/bin/gosu.asc && \
GNUPGHOME="$(mktemp -d)" && \
export GNUPGHOME && \
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
ARG GOSU_VERSION=1.19
ARG GO_VERSION=1.26.1

RUN apk add --no-cache curl git

# Install Go
RUN curl -fsSL "https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz" | tar -C /usr/local -xz
ENV PATH="/usr/local/go/bin:${PATH}"

# Build gosu from source
RUN git clone --depth 1 --branch "${GOSU_VERSION}" https://github.com/tianon/gosu.git /gosu && \
cd /gosu && \
CGO_ENABLED=0 go build -ldflags="-s -w" -o /usr/local/bin/gosu . && \
chmod +x /usr/local/bin/gosu

####################
# Stage 3: Final production image
####################
FROM alpine:3.21 AS production
FROM alpine:3.23 AS production

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

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

# Setup pgsodium key script
Expand Down
6 changes: 3 additions & 3 deletions ansible/vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ postgres_major:

# Full version strings for each major version
postgres_release:
postgresorioledb-17: "17.6.0.057-orioledb"
postgres17: "17.6.1.100"
postgres15: "15.14.1.100"
postgresorioledb-17: "17.6.0.058-orioledb"
postgres17: "17.6.1.101"
postgres15: "15.14.1.101"

# Non Postgres Extensions
pgbouncer_release: 1.25.1
Expand Down
Loading