From 0cecb264b0ba80142e7309455e048895345180d8 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Wed, 18 Sep 2024 12:59:06 +0200 Subject: [PATCH 1/5] Enable Docker build checks https://docs.docker.com/build/checks/ A Docker build will now fail if there is a violation against one of the built-in Docker validation rules --- airflow/Dockerfile | 3 ++- druid/Dockerfile | 1 + hadoop/Dockerfile | 1 + hbase/Dockerfile | 5 +++-- hello-world/Dockerfile | 1 + hive/Dockerfile | 3 ++- java-base/Dockerfile | 2 ++ java-devel/Dockerfile | 1 + kafka-testing-tools/Dockerfile | 1 + kafka/Dockerfile | 1 + kcat/Dockerfile | 1 + krb5/Dockerfile | 1 + nifi/Dockerfile | 1 + omid/Dockerfile | 1 + opa/Dockerfile | 1 + spark-k8s/Dockerfile | 1 + stackable-base/Dockerfile | 1 + statsd_exporter/Dockerfile | 1 + superset/Dockerfile | 1 + testing-tools/Dockerfile | 1 + tools/Dockerfile | 1 + trino-cli/Dockerfile | 1 + trino/Dockerfile | 1 + ubi8-rust-builder/Dockerfile | 1 + ubi9-rust-builder/Dockerfile | 1 + vector/Dockerfile | 1 + zookeeper/Dockerfile | 1 + 27 files changed, 32 insertions(+), 4 deletions(-) diff --git a/airflow/Dockerfile b/airflow/Dockerfile index 00b5a951c..b7b8175bc 100644 --- a/airflow/Dockerfile +++ b/airflow/Dockerfile @@ -1,10 +1,11 @@ # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd +# check=error=true ARG GIT_SYNC # For updated versions check https://github.com/kubernetes/git-sync/releases # which should contain a image location (e.g. registry.k8s.io/git-sync/git-sync:v3.6.8) -FROM oci.stackable.tech/sdp/git-sync:${GIT_SYNC} as gitsync-image +FROM oci.stackable.tech/sdp/git-sync:${GIT_SYNC} AS gitsync-image FROM stackable/image/statsd_exporter AS statsd_exporter-builder diff --git a/druid/Dockerfile b/druid/Dockerfile index e0e3eea26..c78326888 100644 --- a/druid/Dockerfile +++ b/druid/Dockerfile @@ -1,4 +1,5 @@ # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd +# check=error=true FROM stackable/image/java-devel AS druid-builder diff --git a/hadoop/Dockerfile b/hadoop/Dockerfile index 8f011c218..2cdd44cde 100644 --- a/hadoop/Dockerfile +++ b/hadoop/Dockerfile @@ -1,4 +1,5 @@ # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd +# check=error=true FROM stackable/image/java-devel AS builder diff --git a/hbase/Dockerfile b/hbase/Dockerfile index 961f3b2ad..216aed6be 100644 --- a/hbase/Dockerfile +++ b/hbase/Dockerfile @@ -1,4 +1,5 @@ # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd +# check=error=true FROM stackable/image/hadoop AS hadoop-builder @@ -142,7 +143,7 @@ WORKDIR /stackable # Cache mounts are owned by root by default # We need to explicitly give the uid to use which is hardcoded to "1000" in stackable-base -RUN --mount=type=cache,id=maven-hbase-operator-tools,uid=1000,target=/stackable/.m2/repository < Date: Wed, 18 Sep 2024 16:58:05 +0200 Subject: [PATCH 2/5] Fix validation errors --- kafka-testing-tools/Dockerfile | 1 + kafka/Dockerfile | 2 +- opa/Dockerfile | 2 +- spark-k8s/Dockerfile | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/kafka-testing-tools/Dockerfile b/kafka-testing-tools/Dockerfile index ed41497bc..8cd439e46 100644 --- a/kafka-testing-tools/Dockerfile +++ b/kafka-testing-tools/Dockerfile @@ -7,6 +7,7 @@ FROM stackable/image/stackable-base AS final ARG PRODUCT ARG KCAT +ARG RELEASE LABEL name="Kafka Testing Tools" \ maintainer="info@stackable.tech" \ diff --git a/kafka/Dockerfile b/kafka/Dockerfile index 5c48645d9..094b812c9 100644 --- a/kafka/Dockerfile +++ b/kafka/Dockerfile @@ -3,7 +3,7 @@ FROM stackable/image/kcat AS kcat -FROM stackable/image/java-devel as kafka-builder +FROM stackable/image/java-devel AS kafka-builder ARG PRODUCT ARG SCALA diff --git a/opa/Dockerfile b/opa/Dockerfile index eb8b55e07..2fe1802c9 100644 --- a/opa/Dockerfile +++ b/opa/Dockerfile @@ -55,7 +55,7 @@ WORKDIR /daemontools/admin/daemontools-${DAEMONTOOLS_VERSION} RUN package/install -FROM stackable/image/stackable-base as opa-builder +FROM stackable/image/stackable-base AS opa-builder ARG PRODUCT ARG RELEASE diff --git a/spark-k8s/Dockerfile b/spark-k8s/Dockerfile index 003ce805f..c842dd2ea 100644 --- a/spark-k8s/Dockerfile +++ b/spark-k8s/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd # check=error=true -FROM stackable/image/java-devel as builder +FROM stackable/image/java-devel AS builder ARG PRODUCT ARG HADOOP_LONG_VERSION @@ -94,7 +94,7 @@ COPY shared/log4shell_scanner /bin/log4shell_scanner RUN /bin/log4shell_scanner s /stackable/spark-${PRODUCT}/dist # === -FROM stackable/image/java-base as final +FROM stackable/image/java-base AS final ARG PRODUCT ARG PYTHON @@ -133,7 +133,7 @@ ENV HOME=/stackable ENV SPARK_HOME=/stackable/spark ENV PATH=$SPARK_HOME:$PATH:/bin:$JAVA_HOME/bin:$JAVA_HOME/jre/bin:$HOME/.local/bin ENV PYSPARK_PYTHON=/usr/bin/python -ENV PYTHONPATH=$SPARK_HOME/python:$PYTHONPATH +ENV PYTHONPATH=$SPARK_HOME/python COPY --chown=stackable:stackable --from=builder /stackable/spark-${PRODUCT}/dist /stackable/spark COPY --chown=stackable:stackable --from=builder /stackable/spark-${PRODUCT}/assembly/target/bom.json /stackable/spark/spark-${PRODUCT}.cdx.json From 86518ca68f40fc4d514ebf4a6bfb79e6cf92dc98 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Tue, 1 Oct 2024 11:03:10 +0200 Subject: [PATCH 3/5] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b761d76d5..737231d87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ All notable changes to this project will be documented in this file. - ci: Rename local actions, adjust action inputs and outputs, add definition README file ([#819]). - Update cargo-cyclonedx to 0.5.5 and build CycloneDX 1.5 files ([#783]) +- Enable [Docker build checks](https://docs.docker.com/build/checks/) ([#872]) ### Removed @@ -68,6 +69,7 @@ All notable changes to this project will be documented in this file. [#866]: https://github.com/stackabletech/docker-images/pull/866 [#867]: https://github.com/stackabletech/docker-images/pull/867 [#868]: https://github.com/stackabletech/docker-images/pull/868 +[#872]: https://github.com/stackabletech/docker-images/pull/872 [#874]: https://github.com/stackabletech/docker-images/pull/874 [#877]: https://github.com/stackabletech/docker-images/pull/877 [#878]: https://github.com/stackabletech/docker-images/pull/878 From e615472b63f151a7e77045e09e067779588687e1 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Tue, 1 Oct 2024 11:05:22 +0200 Subject: [PATCH 4/5] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 737231d87..4c657955d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,7 +28,7 @@ All notable changes to this project will be documented in this file. - ci: Rename local actions, adjust action inputs and outputs, add definition README file ([#819]). - Update cargo-cyclonedx to 0.5.5 and build CycloneDX 1.5 files ([#783]) -- Enable [Docker build checks](https://docs.docker.com/build/checks/) ([#872]) +- Enable [Docker build checks](https://docs.docker.com/build/checks/) ([#872]) ### Removed From 19299ec51a4cf7ee6356e4812b59599548fce350 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Tue, 1 Oct 2024 11:06:35 +0200 Subject: [PATCH 5/5] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c657955d..610396d2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -69,7 +69,7 @@ All notable changes to this project will be documented in this file. [#866]: https://github.com/stackabletech/docker-images/pull/866 [#867]: https://github.com/stackabletech/docker-images/pull/867 [#868]: https://github.com/stackabletech/docker-images/pull/868 -[#872]: https://github.com/stackabletech/docker-images/pull/872 +[#872]: https://github.com/stackabletech/docker-images/pull/872 [#874]: https://github.com/stackabletech/docker-images/pull/874 [#877]: https://github.com/stackabletech/docker-images/pull/877 [#878]: https://github.com/stackabletech/docker-images/pull/878