Skip to content

Commit da6a562

Browse files
authored
KAFKA-17834: Improvements to Dockerfile (#17554)
Reviewers: Mickael Maison <[email protected]>, Chia-Ping Tsai <[email protected]>
1 parent a0640f9 commit da6a562

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

docker/jvm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ LABEL org.label-schema.name="kafka" \
6868
org.label-schema.description="Apache Kafka" \
6969
org.label-schema.build-date="${build_date}" \
7070
org.label-schema.vcs-url="https://github.com/apache/kafka" \
71-
maintainer="Apache Kafka"
71+
org.opencontainers.image.authors="Apache Kafka"
7272

7373
RUN mkdir opt/kafka; \
7474
set -eux ; \

docker/native/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ LABEL org.label-schema.name="kafka" \
5555
org.label-schema.description="Apache Kafka" \
5656
org.label-schema.build-date="${build_date}" \
5757
org.label-schema.vcs-url="https://github.com/apache/kafka" \
58-
maintainer="Apache Kafka"
58+
org.opencontainers.image.authors="Apache Kafka"
5959

6060
RUN apk update ; \
6161
apk add --no-cache gcompat ; \

tests/docker/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ RUN if [ "$KAFKA_MODE" = "native" ]; then \
4444

4545
FROM $jdk_version
4646

47-
MAINTAINER Apache Kafka [email protected]
47+
LABEL org.opencontainers.image.authors="Apache Kafka [email protected]"
4848
VOLUME ["/opt/kafka-dev"]
4949

5050
# Set the timezone.
5151
ENV TZ="/usr/share/zoneinfo/America/Los_Angeles"
5252

5353
# Do not ask for confirmations when running apt-get, etc.
54-
ENV DEBIAN_FRONTEND noninteractive
54+
ENV DEBIAN_FRONTEND=noninteractive
5555

5656
# Set the ducker.creator label so that we know that this is a ducker image. This will make it
5757
# visible to 'ducker purge'. The ducker.creator label also lets us know what UNIX user built this
@@ -155,4 +155,4 @@ RUN useradd -u $UID -ms /bin/bash ducker \
155155

156156
USER ducker
157157

158-
CMD sudo service ssh start && tail -f /dev/null
158+
CMD ["sudo", "service", "ssh", "start", "-D"]

0 commit comments

Comments
 (0)