Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions docker/kafka/3/debian12/3.7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861 as ospo
FROM marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0 as ospo

# Download Licenses and restricted source-code
COPY components.csv /components.csv
Expand All @@ -16,18 +16,19 @@ RUN mkdir -p /usr/src/licenses \
&& /download-ref-repos.sh /source_code.txt /usr/src


FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861
FROM marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0

COPY --from=ospo /usr/src /usr/src

ARG KAFKA_VERSION=3.7.0
ARG KAFKA_VERSION=3.7.2
ARG SCALA_VERSION=2.13

ENV C2D_RELEASE 3.7.0
ENV C2D_RELEASE 3.7.2

RUN set -ex \
&& apt-get update \
&& apt-get -y install curl default-jdk ca-certificates jq net-tools \
&& apt-get install -y --only-upgrade perl zlib1g \
&& rm -rf /var/lib/apt/lists/*

ENV KAFKA_USER="kafka" \
Expand All @@ -50,7 +51,7 @@ RUN set -ex; \

COPY --chown=$KAFKA_USER:$KAFKA_GROUP scripts ${KAFKA_DOCKER_SCRIPTS}

# Download and setup kafka version v3.7.0
# Download and setup kafka version v3.7.2
RUN chmod a+x ${KAFKA_DOCKER_SCRIPTS}/*.sh \
&& ln -s ${KAFKA_DOCKER_SCRIPTS}/*.sh /usr/bin \
&& curl -sSL ${KAFKA_DIST_URL} -o "/opt/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz" \
Expand Down
11 changes: 6 additions & 5 deletions docker/kafka/3/debian12/3.9/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861 as ospo
FROM marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0 as ospo

# Download Licenses and restricted source-code
COPY components.csv /components.csv
Expand All @@ -16,18 +16,19 @@ RUN mkdir -p /usr/src/licenses \
&& /download-ref-repos.sh /source_code.txt /usr/src


FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861
FROM marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0

COPY --from=ospo /usr/src /usr/src

ARG KAFKA_VERSION=3.9.0
ARG KAFKA_VERSION=3.9.2
ARG SCALA_VERSION=2.13

ENV C2D_RELEASE 3.9.0
ENV C2D_RELEASE 3.9.2

RUN set -ex \
&& apt-get update \
&& apt-get -y install curl default-jdk ca-certificates jq net-tools \
&& apt-get install -y --only-upgrade perl zlib1g \
&& rm -rf /var/lib/apt/lists/*

ENV KAFKA_USER="kafka" \
Expand All @@ -50,7 +51,7 @@ RUN set -ex; \

COPY --chown=$KAFKA_USER:$KAFKA_GROUP scripts ${KAFKA_DOCKER_SCRIPTS}

# Download and setup kafka version v3.9.0
# Download and setup kafka version v3.9.2
RUN chmod a+x ${KAFKA_DOCKER_SCRIPTS}/*.sh \
&& ln -s ${KAFKA_DOCKER_SCRIPTS}/*.sh /usr/bin \
&& curl -sSL ${KAFKA_DIST_URL} -o "/opt/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz" \
Expand Down
3 changes: 2 additions & 1 deletion docker/kafka/exporter/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861
FROM marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0

ENV EXPORTER_VERSION 1.9.0

Expand All @@ -13,6 +13,7 @@ ENV PATH="${PATH}:${EXPORTER_HOME}"
RUN set -ex; \
apt update \
&& apt -y install ca-certificates curl \
&& apt -y install --only-upgrade perl zlib1g \
&& groupadd -r --gid "${EXPORTER_GID}" "${EXPORTER_GROUP}" \
&& useradd -r --uid "${EXPORTER_UID}" --gid "${EXPORTER_GID}" -s /sbin/nologin "${EXPORTER_USER}"

Expand Down
1 change: 1 addition & 0 deletions docker/kafka/templates/exporter/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ENV PATH="${PATH}:${EXPORTER_HOME}"
RUN set -ex; \
apt update \
&& apt -y install ca-certificates curl \
&& apt -y install --only-upgrade perl zlib1g \
&& groupadd -r --gid "${EXPORTER_GID}" "${EXPORTER_GROUP}" \
&& useradd -r --uid "${EXPORTER_UID}" --gid "${EXPORTER_GID}" -s /sbin/nologin "${EXPORTER_USER}"

Expand Down
1 change: 1 addition & 0 deletions docker/kafka/templates/kafka/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ ENV C2D_RELEASE {{ $kafka.Version }}
RUN set -ex \
&& apt-get update \
&& apt-get -y install curl default-jdk ca-certificates jq net-tools \
&& apt-get install -y --only-upgrade perl zlib1g \
&& rm -rf /var/lib/apt/lists/*

ENV KAFKA_USER="kafka" \
Expand Down
18 changes: 9 additions & 9 deletions docker/kafka/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@ versions:
- dir: 3/debian12/3.9
excludeTests:
- tests/functional_tests/exporter_test.yaml
from: marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861
from: marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0
packages:
kafka:
version: 3.9.0
version: 3.9.2
scala:
version: '2.13'
repo: kafka3
annotations:
- key: com.googleapis.cloudmarketplace.product.service.name
value: services/ccea51e8-0540-4d1b-890e-2a1b04da0383.cloudpartnerservices.goog
tags:
- 3.9.0-debian12
- 3.9.2-debian12
- 3.9-debian12
- 3-debian12
- 3.9.0
- 3.9.2
- '3.9'
- '3'
- latest
Expand All @@ -47,20 +47,20 @@ versions:
- dir: 3/debian12/3.7
excludeTests:
- tests/functional_tests/exporter_test.yaml
from: marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861
from: marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0
packages:
kafka:
version: 3.7.0
version: 3.7.2
scala:
version: '2.13'
repo: kafka3
annotations:
- key: com.googleapis.cloudmarketplace.product.service.name
value: services/ccea51e8-0540-4d1b-890e-2a1b04da0383.cloudpartnerservices.goog
tags:
- 3.7.0-debian12
- 3.7.2-debian12
- 3.7-debian12
- 3.7.0
- 3.7.2
- '3.7'
templateSubDir: kafka
allowlist:
Expand All @@ -71,7 +71,7 @@ versions:
- dir: exporter
excludeTests:
- tests/functional_tests/running_test.yaml
from: marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861
from: marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0
packages:
kafka_exporter:
version: 1.9.0
Expand Down
Loading