Skip to content

Commit 9ba2332

Browse files
committed
Fix Docker templates: use explicit base image tags and update Alpine build
- Add -bookworm suffix to Debian-based Dockerfile templates to ensure consistent base images (postgres-14, postgres-15, postgres-16, postgres-17, postgres-18, latest) - Update Alpine template to use versioned LLVM packages (llvm19-dev, clang19, llvm19-libs) instead of generic clang/llvm - Refactor Alpine build commands for better readability Backport from citusdata/docker@7794206
1 parent ef09af7 commit 9ba2332

7 files changed

Lines changed: 19 additions & 30 deletions

File tree

packaging_automation/templates/docker/alpine/alpine.tmpl.dockerfile

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,19 @@ LABEL maintainer="Citus Data https://citusdata.com" \
1212
org.label-schema.schema-version="1.0"
1313

1414
# Build citus and delete all used libraries. Warning: Libraries installed in this section will be deleted after build completion
15-
RUN apk add --no-cache \
16-
--virtual builddeps \
17-
build-base \
18-
krb5-dev \
19-
curl \
20-
curl-dev \
21-
openssl-dev \
22-
ca-certificates \
23-
clang \
24-
llvm \
25-
lz4-dev \
26-
zstd-dev \
27-
libxslt-dev \
28-
libxml2-dev \
29-
icu-dev && \
30-
apk add --no-cache libcurl && \
31-
curl -sfLO "https://github.com/citusdata/citus/archive/v${VERSION}.tar.gz" && \
32-
tar xzf "v${VERSION}.tar.gz" && \
33-
cd "citus-${VERSION}" && \
34-
./configure --with-security-flags && \
35-
make install && \
36-
cd .. && \
37-
rm -rf "citus-${VERSION}" "v${VERSION}.tar.gz" && \
38-
apk del builddeps
15+
RUN apk add --no-cache --virtual builddeps \
16+
build-base krb5-dev curl curl-dev openssl-dev ca-certificates \
17+
llvm19-dev clang19 llvm19-libs \
18+
lz4-dev zstd-dev libxslt-dev libxml2-dev icu-dev \
19+
&& apk add --no-cache libcurl \
20+
&& curl -sfLO "https://github.com/citusdata/citus/archive/v${VERSION}.tar.gz" \
21+
&& tar xzf "v${VERSION}.tar.gz" \
22+
&& cd "citus-${VERSION}" \
23+
&& ./configure --with-security-flags \
24+
&& make install \
25+
&& cd .. \
26+
&& rm -rf "citus-${VERSION}" "v${VERSION}.tar.gz" \
27+
&& apk del builddeps
3928

4029
#--------End of Citus Build
4130

packaging_automation/templates/docker/latest/latest.tmpl.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is auto generated from it's template,
22
# see citusdata/tools/packaging_automation/templates/docker/latest/latest.tmpl.dockerfile.
3-
FROM postgres:{{postgres_version}}
3+
FROM postgres:{{postgres_version}}-bookworm
44
ARG VERSION={{project_version}}
55
LABEL maintainer="Citus Data https://citusdata.com" \
66
org.label-schema.name="Citus" \

packaging_automation/templates/docker/postgres-14/postgres-14.tmpl.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is auto generated from it's template,
22
# see citusdata/tools/packaging_automation/templates/docker/postgres-14/postgres-14.tmpl.dockerfile.
3-
FROM postgres:{{postgres_version}}
3+
FROM postgres:{{postgres_version}}-bookworm
44
ARG VERSION={{project_version}}
55
LABEL maintainer="Citus Data https://citusdata.com" \
66
org.label-schema.name="Citus" \

packaging_automation/templates/docker/postgres-15/postgres-15.tmpl.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is auto generated from it's template,
22
# see citusdata/tools/packaging_automation/templates/docker/postgres-15/postgres-15.tmpl.dockerfile.
3-
FROM postgres:{{postgres_version}}
3+
FROM postgres:{{postgres_version}}-bookworm
44
ARG VERSION={{project_version}}
55
LABEL maintainer="Citus Data https://citusdata.com" \
66
org.label-schema.name="Citus" \

packaging_automation/templates/docker/postgres-16/postgres-16.tmpl.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is auto generated from it's template,
22
# see citusdata/tools/packaging_automation/templates/docker/postgres-16/postgres-16.tmpl.dockerfile.
3-
FROM postgres:{{postgres_version}}
3+
FROM postgres:{{postgres_version}}-bookworm
44
ARG VERSION={{project_version}}
55
LABEL maintainer="Citus Data https://citusdata.com" \
66
org.label-schema.name="Citus" \

packaging_automation/templates/docker/postgres-17/postgres-17.tmpl.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is auto generated from it's template,
22
# see citusdata/tools/packaging_automation/templates/docker/postgres-17/postgres-17.tmpl.dockerfile.
3-
FROM postgres:{{postgres_version}}
3+
FROM postgres:{{postgres_version}}-bookworm
44
ARG VERSION={{project_version}}
55
LABEL maintainer="Citus Data https://citusdata.com" \
66
org.label-schema.name="Citus" \

packaging_automation/templates/docker/postgres-18/postgres-18.tmpl.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is auto generated from it's template,
22
# see citusdata/tools/packaging_automation/templates/docker/postgres-18/postgres-18.tmpl.dockerfile.
3-
FROM postgres:{{postgres_version}}
3+
FROM postgres:{{postgres_version}}-bookworm
44
ARG VERSION={{project_version}}
55
LABEL maintainer="Citus Data https://citusdata.com" \
66
org.label-schema.name="Citus" \

0 commit comments

Comments
 (0)