Skip to content

Fix Docker templates: use explicit base image tags and update Alpine … #387

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

Draft
m3hm3t wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Fix Docker templates: use explicit base image tags and update Alpine … #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 13 additions & 24 deletions packaging_automation/templates/docker/alpine/alpine.tmpl.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,19 @@ LABEL maintainer="Citus Data https://citusdata.com" \
org.label-schema.schema-version="1.0"

# Build citus and delete all used libraries. Warning: Libraries installed in this section will be deleted after build completion
RUN apk add --no-cache \
--virtual builddeps \
build-base \
krb5-dev \
curl \
curl-dev \
openssl-dev \
ca-certificates \
clang \
llvm \
lz4-dev \
zstd-dev \
libxslt-dev \
libxml2-dev \
icu-dev && \
apk add --no-cache libcurl && \
curl -sfLO "https://github.com/citusdata/citus/archive/v${VERSION}.tar.gz" && \
tar xzf "v${VERSION}.tar.gz" && \
cd "citus-${VERSION}" && \
./configure --with-security-flags && \
make install && \
cd .. && \
rm -rf "citus-${VERSION}" "v${VERSION}.tar.gz" && \
apk del builddeps
RUN apk add --no-cache --virtual builddeps \
build-base krb5-dev curl curl-dev openssl-dev ca-certificates \
llvm19-dev clang19 llvm19-libs \
lz4-dev zstd-dev libxslt-dev libxml2-dev icu-dev \
&& apk add --no-cache libcurl \
&& curl -sfLO "https://github.com/citusdata/citus/archive/v${VERSION}.tar.gz" \
&& tar xzf "v${VERSION}.tar.gz" \
&& cd "citus-${VERSION}" \
&& ./configure --with-security-flags \
&& make install \
&& cd .. \
&& rm -rf "citus-${VERSION}" "v${VERSION}.tar.gz" \
&& apk del builddeps

#--------End of Citus Build

Expand Down
2 changes: 1 addition & 1 deletion packaging_automation/templates/docker/latest/latest.tmpl.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is auto generated from it's template,
# see citusdata/tools/packaging_automation/templates/docker/latest/latest.tmpl.dockerfile.
FROM postgres:{{postgres_version}}
FROM postgres:{{postgres_version}}-bookworm
ARG VERSION={{project_version}}
LABEL maintainer="Citus Data https://citusdata.com" \
org.label-schema.name="Citus" \
Expand Down
2 changes: 1 addition & 1 deletion packaging_automation/templates/docker/postgres-14/postgres-14.tmpl.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is auto generated from it's template,
# see citusdata/tools/packaging_automation/templates/docker/postgres-14/postgres-14.tmpl.dockerfile.
FROM postgres:{{postgres_version}}
FROM postgres:{{postgres_version}}-bookworm
ARG VERSION={{project_version}}
LABEL maintainer="Citus Data https://citusdata.com" \
org.label-schema.name="Citus" \
Expand Down
2 changes: 1 addition & 1 deletion packaging_automation/templates/docker/postgres-15/postgres-15.tmpl.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is auto generated from it's template,
# see citusdata/tools/packaging_automation/templates/docker/postgres-15/postgres-15.tmpl.dockerfile.
FROM postgres:{{postgres_version}}
FROM postgres:{{postgres_version}}-bookworm
ARG VERSION={{project_version}}
LABEL maintainer="Citus Data https://citusdata.com" \
org.label-schema.name="Citus" \
Expand Down
2 changes: 1 addition & 1 deletion packaging_automation/templates/docker/postgres-16/postgres-16.tmpl.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is auto generated from it's template,
# see citusdata/tools/packaging_automation/templates/docker/postgres-16/postgres-16.tmpl.dockerfile.
FROM postgres:{{postgres_version}}
FROM postgres:{{postgres_version}}-bookworm
ARG VERSION={{project_version}}
LABEL maintainer="Citus Data https://citusdata.com" \
org.label-schema.name="Citus" \
Expand Down
2 changes: 1 addition & 1 deletion packaging_automation/templates/docker/postgres-17/postgres-17.tmpl.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is auto generated from it's template,
# see citusdata/tools/packaging_automation/templates/docker/postgres-17/postgres-17.tmpl.dockerfile.
FROM postgres:{{postgres_version}}
FROM postgres:{{postgres_version}}-bookworm
ARG VERSION={{project_version}}
LABEL maintainer="Citus Data https://citusdata.com" \
org.label-schema.name="Citus" \
Expand Down
2 changes: 1 addition & 1 deletion packaging_automation/templates/docker/postgres-18/postgres-18.tmpl.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is auto generated from it's template,
# see citusdata/tools/packaging_automation/templates/docker/postgres-18/postgres-18.tmpl.dockerfile.
FROM postgres:{{postgres_version}}
FROM postgres:{{postgres_version}}-bookworm
ARG VERSION={{project_version}}
LABEL maintainer="Citus Data https://citusdata.com" \
org.label-schema.name="Citus" \
Expand Down
Loading