Skip to content

Commit 568b009

Browse files
authored
Update docker image bases (#161)
1 parent aa39fe1 commit 568b009

File tree

10 files changed

+54
-18
lines changed

10 files changed

+54
-18
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
AWS_ENDPOINT_URL_S3: http://localhost:9000
4646
services:
4747
postgres:
48-
image: postgres:17.4-bookworm
48+
image: postgres:18.1-trixie
4949
env:
5050
POSTGRES_USER: attune
5151
POSTGRES_PASSWORD: attune

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
AWS_ENDPOINT_URL_S3: http://localhost:9000
4242
services:
4343
postgres:
44-
image: postgres:17.4-bookworm
44+
image: postgres:18.1-trixie
4545
env:
4646
POSTGRES_USER: attune
4747
POSTGRES_PASSWORD: attune

.github/workflows/tag.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
AWS_ENDPOINT_URL_S3: http://localhost:9000
126126
services:
127127
postgres:
128-
image: postgres:17.4-bookworm
128+
image: postgres:18.1-trixie
129129
env:
130130
POSTGRES_USER: attune
131131
POSTGRES_PASSWORD: attune

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ services:
2424
networks:
2525
- dev
2626
postgres:
27-
image: postgres:17.4-bookworm
27+
image: postgres:18.1-trixie
2828
environment:
2929
- POSTGRES_USER=attune
3030
- POSTGRES_PASSWORD=attune
3131
- POSTGRES_DB=attune
3232
ports:
3333
- "5432:5432"
3434
volumes:
35-
- ./postgres-data:/var/lib/postgresql/data
35+
- ./postgres-data:/var/lib/postgresql
3636
healthcheck:
3737
test: ["CMD", "pg_isready", "-U", "attune"]
3838
interval: 3s

docker/attune-ee/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:1.89.0-bookworm AS build
1+
FROM rust:1.89.0-trixie AS build
22

33
RUN apt-get update && apt-get install -y pkg-config libgpg-error-dev libgpgme-dev
44

@@ -29,7 +29,7 @@ COPY ./scripts ./scripts
2929
COPY ./docker/migrate/prisma/migrations ./docker/migrate/prisma/migrations
3030
RUN cargo build --release
3131

32-
FROM debian:bookworm-slim AS runtime
32+
FROM debian:trixie-slim AS runtime
3333

3434
RUN apt-get update
3535
RUN apt-get install -y --no-install-recommends libssl3 ca-certificates libgpg-error0 libgpgme11 curl && rm -rf /var/lib/apt/lists/*

docker/attune/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:1.89.0-bookworm AS build
1+
FROM rust:1.89.0-trixie AS build
22

33
RUN apt-get update && apt-get install -y pkg-config libgpg-error-dev libgpgme-dev
44

@@ -16,7 +16,7 @@ COPY ./packages ./packages
1616
COPY ./scripts/fixtures ./scripts/fixtures
1717
RUN cargo build --release --bin attune-server
1818

19-
FROM debian:bookworm-slim AS runtime
19+
FROM debian:trixie-slim AS runtime
2020

2121
RUN apt-get update
2222
RUN apt-get install -y --no-install-recommends libssl3 ca-certificates libgpg-error0 libgpgme11 curl && rm -rf /var/lib/apt/lists/*

docker/migrate/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:24-bookworm
1+
FROM node:24-trixie
22

33
WORKDIR /app
44
COPY ./package.json ./package-lock.json ./

docker/minio/Dockerfile

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
1-
FROM minio/minio:RELEASE.2025-04-08T15-41-24Z-cpuv1
1+
# Building MinIO from source because they no longer provide a prebuilt image:
2+
# https://github.com/minio/minio/issues/21647
23

3-
COPY ./entrypoint.sh /entrypoint.sh
4-
RUN chmod +x /entrypoint.sh
5-
ENTRYPOINT [ "/bin/bash", "/entrypoint.sh" ]
4+
# Update this when building new images.
5+
ARG MINIO_RELEASE=RELEASE.2025-10-15T17-29-55Z
6+
7+
FROM golang:1.24-alpine AS minio-builder
8+
ARG MINIO_RELEASE
9+
RUN apk add --no-cache git
10+
RUN git clone --depth 1 --branch ${MINIO_RELEASE} https://github.com/minio/minio.git /src
11+
WORKDIR /src
12+
RUN go build -o /usr/local/bin/minio .
13+
14+
FROM alpine:3.21
15+
COPY --from=minio-builder /usr/local/bin/minio /usr/local/bin/minio
16+
17+
# We can use the prebuilt `mc` binary from MinIO's release page, they still
18+
# publish that.
19+
ARG TARGETARCH
20+
RUN wget -q https://dl.min.io/client/mc/release/linux-${TARGETARCH}/mc -O /usr/local/bin/mc && \
21+
chmod +x /usr/local/bin/mc
22+
COPY --chmod=755 ./entrypoint.sh /entrypoint.sh
23+
24+
ENTRYPOINT [ "/bin/sh", "/entrypoint.sh" ]

docker/minio/entrypoint.sh

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,32 @@
1-
#!/bin/bash
1+
#!/bin/sh
22

33
# This creates a default bucket for the Minio instance, which is required by
44
# Attune.
55
#
66
# See: https://github.com/minio/minio/issues/4769
7-
set -euxo pipefail
7+
set -eux
88
minio server /data --console-address ":9001" &
99
MINIO_SERVER_PID=$!
10-
sleep 1
10+
11+
# Wait for minio to be ready (CI can be slow)
12+
MINIO_READY=false
13+
for i in 1 2 3 4 5; do
14+
if mc alias set local http://127.0.0.1:9000 attuneminio attuneminio 2>/dev/null; then
15+
MINIO_READY=true
16+
break
17+
fi
18+
echo "Waiting for minio to start (attempt $i)..."
19+
sleep $i
20+
done
21+
if [ "$MINIO_READY" = "false" ]; then
22+
echo "ERROR: MinIO failed to start after 5 attempts"
23+
exit 1
24+
fi
25+
26+
# 'local' alias was set in the loop above. Now set 'attune' alias.
1127
mc alias set attune http://127.0.0.1:9000 attuneminio attuneminio
1228
mc mb --ignore-existing attune/attune-dev-0
29+
1330
# This needs to be readable for the E2E test to install packages, and writeable
1431
# for integration tests to upload objects.
1532
mc anonymous set public attune/attune-dev-0

docker/testinstall/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM debian:bookworm-slim
1+
FROM debian:trixie-slim
22

33
RUN apt-get update && apt-get install -y apt-transport-https ca-certificates

0 commit comments

Comments
 (0)