Skip to content

Commit e765410

Browse files
committed
chore(ct): upgrade configbaker to Alpine 3.21 and pin down dependencies
To avoid too many surprises from updates, we pin down the installed package versions. Updates will be handled by letting Renovate create PRs to update the versions.
1 parent f105dec commit e765410

File tree

1 file changed

+33
-7
lines changed

1 file changed

+33
-7
lines changed

modules/container-configbaker/Dockerfile

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,49 @@ ARG SOLR_VERSION
99
# We simply have this intermediate stage here without any activity to copy the default configset over
1010
FROM solr:${SOLR_VERSION} AS solr
1111

12-
# Let's build us a baker
13-
# WARNING:
14-
# Do not upgrade the tag to :3 or :3.19 until https://pkgs.alpinelinux.org/package/v3.19/main/x86_64/c-ares is at v1.26.0+!
15-
# See https://github.com/IQSS/dataverse/issues/10413 for more information.
16-
FROM alpine:3.18
12+
# Let's build ourselves a baker
13+
FROM alpine:3.21
1714

1815
ENV SCRIPT_DIR="/scripts" \
1916
SECRETS_DIR="/secrets" \
2017
SOLR_TEMPLATE="/template"
2118
ENV PATH="${PATH}:${SCRIPT_DIR}" \
2219
BOOTSTRAP_DIR="${SCRIPT_DIR}/bootstrap"
2320

24-
ARG APK_PACKAGES="curl bind-tools netcat-openbsd jq bash dumb-init wait4x ed postgresql-client aws-cli"
21+
# renovate: datasource=repology depName=alpine_3_21/aws-cli
22+
ENV AWS_CLI_VERSION="2.22.10-r0"
23+
# renovate: datasource=repology depName=alpine_3_21/bash
24+
ENV BASH_VERSION="5.2.37-r0"
25+
# renovate: datasource=repology depName=alpine_3_21/bind-tools
26+
ENV BIND_TOOLS_VERSION="9.18.36-r0"
27+
# renovate: datasource=repology depName=alpine_3_21/curl
28+
ENV CURL_VERSION="8.12.1-r1"
29+
# renovate: datasource=repology depName=alpine_3_21/dumb-init
30+
ENV DUMB_INIT_VERSION="1.2.5-r3"
31+
# renovate: datasource=repology depName=alpine_3_21/ed
32+
ENV ED_VERSION="1.20.2-r0"
33+
# renovate: datasource=repology depName=alpine_3_21/jq
34+
ENV JQ_VERSION="1.7.1-r0"
35+
# renovate: datasource=repology depName=alpine_3_21/netcat-openbsd
36+
ENV NETCAT_VERSION="1.226.1.1-r0"
37+
# renovate: datasource=repology depName=alpine_3_21/postgresql17-client
38+
ENV PGCLIENT17_VERSION="17.5-r0"
39+
# renovate: datasource=repology depName=alpine_3_21/wait4x
40+
ENV WAIT4X_VERSION="2.14.0-r10"
2541

2642
RUN true && \
2743
# Install necessary software and tools
28-
apk add --no-cache ${APK_PACKAGES} && \
44+
apk add --no-cache \
45+
aws-cli=${AWS_CLI_VERSION} \
46+
bind-tools=${BIND_TOOLS_VERSION} \
47+
bash=${BASH_VERSION} \
48+
curl=${CURL_VERSION} \
49+
dumb-init=${DUMB_INIT_VERSION} \
50+
ed=${ED_VERSION} \
51+
jq=${JQ_VERSION} \
52+
netcat-openbsd=${NETCAT_VERSION} \
53+
postgresql17-client=${PGCLIENT17_VERSION} \
54+
wait4x=${WAIT4X_VERSION} && \
2955
# Make our working directories
3056
mkdir -p ${SCRIPT_DIR} ${SECRETS_DIR} ${SOLR_TEMPLATE}
3157

0 commit comments

Comments
 (0)