Merge branch 'main' into feature/image-tools-revamp

lfrancke · lfrancke · commit 04a89b2a2d62 · 2024-10-01T16:03:03.000+02:00
# Conflicts:
#	hbase/Dockerfile
#	hive/Dockerfile
diff --git 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
diff --git a/airflow/Dockerfile b/airflow/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 ARG GIT_SYNC
 
diff --git 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
@@ -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
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/hadoop AS hadoop-builder
 
@@ -145,7 +146,7 @@ WORKDIR /stackable
 
 # Cache mounts are owned by root by default
 # We need to explicitly give the uid to use
-RUN --mount=type=cache,id=maven-hbase-operator-tools,uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
+RUN --mount=type=cache,id=maven-hbase-operator-tools-${HBASE_OPERATOR_TOOLS},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
 
 curl "https://repo.stackable.tech/repository/packages/hbase-operator-tools/hbase-operator-tools-${HBASE_OPERATOR_TOOLS}-src.tar.gz" | tar -xzC .
 mv hbase-operator-tools-${HBASE_OPERATOR_TOOLS} hbase-operator-tools-${HBASE_OPERATOR_TOOLS}-src
@@ -234,7 +235,7 @@ COPY --chown=${STACKABLE_USER_UID}:0 hbase/stackable/patches /stackable/patches
 USER ${STACKABLE_USER_UID}
 WORKDIR /stackable
 
-RUN --mount=type=cache,id=maven-phoenix,uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
+RUN --mount=type=cache,id=maven-phoenix-${PHOENIX},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
 cd /stackable
 curl "https://repo.stackable.tech/repository/packages/phoenix/phoenix-${PHOENIX}-src.tar.gz" | tar -xzC .
 mv phoenix-${PHOENIX} phoenix-${PHOENIX}-src
diff --git a/hello-world/Dockerfile b/hello-world/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/java-base
 
diff --git a/hive/Dockerfile b/hive/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/hadoop AS hadoop-builder
 
diff --git a/java-base/Dockerfile b/java-base/Dockerfile
@@ -1,4 +1,6 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
+
 #
 # Provides the common Java Runtime for SDP products
 #
diff --git a/java-devel/Dockerfile b/java-devel/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 #
 # Base imaege for builder stages
diff --git a/kafka-testing-tools/Dockerfile b/kafka-testing-tools/Dockerfile
@@ -1,11 +1,13 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/kcat AS kcat
 
 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
@@ -1,8 +1,9 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 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/kcat/Dockerfile b/kcat/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 # Normally we would use stackable/image/stackable-base here, *but* we fail to link kcat at the end with error messages
 # shown in Snippet 1, which we were not able to solve.
diff --git a/krb5/Dockerfile b/krb5/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 # RedHat UBI does not package krb5-server, so we cannot use it as a KDC
 # FROM stackable/image/stackable-base
diff --git a/nifi/Dockerfile b/nifi/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/java-devel AS nifi-builder
 
diff --git a/omid/Dockerfile b/omid/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/opa/Dockerfile b/opa/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/stackable-base AS opa-bundle-builder
 
@@ -54,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
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 # hadoop-builder: Provides Hadoop libraries
 FROM stackable/image/hadoop AS hadoop-builder
@@ -8,7 +9,7 @@ FROM stackable/image/hbase AS hbase-builder
 
 # spark-source-builder: Download the Spark source code into
 # /stackable/spark and apply the patches
-FROM stackable/image/java-devel as spark-source-builder
+FROM stackable/image/java-devel AS spark-source-builder
 
 ARG PRODUCT
 
@@ -45,7 +46,7 @@ RUN patches/apply_patches.sh ${PRODUCT}
 
 # hbase-connectors-builder: Build the Spark HBase connector and copy
 # required JARs into /stackable/spark/jars
-FROM stackable/image/java-devel as hbase-connectors-builder
+FROM stackable/image/java-devel AS hbase-connectors-builder
 
 ARG PRODUCT
 ARG HADOOP
@@ -243,8 +244,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
@@ -283,7 +283,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=spark-builder /stackable/spark-${PRODUCT}/dist /stackable/spark
 COPY --chown=stackable:stackable --from=spark-builder /stackable/spark-${PRODUCT}/assembly/target/bom.json /stackable/spark/spark-${PRODUCT}.cdx.json
diff --git a/stackable-base/Dockerfile b/stackable-base/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 # Find the latest version at https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?container-tabs=gti
 # IMPORTANT: Make sure to use the "Manifest List Digest" that references the images for multiple architectures
diff --git a/statsd_exporter/Dockerfile b/statsd_exporter/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/stackable-base
 ARG PRODUCT
diff --git a/superset/Dockerfile b/superset/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/statsd_exporter AS statsd_exporter-builder
 
@@ -38,6 +39,9 @@ RUN microdnf update \
     && microdnf clean all && \
     rm -rf /var/cache/yum
 
+# DL3042 false-positive, --no-chache-dir is specified a few lines below.
+#        See https://github.com/hadolint/hadolint/issues/1042.
+# hadolint ignore=DL3042
 RUN python3 -m venv /stackable/app \
     && source /stackable/app/bin/activate \
     && pip install \
@@ -55,7 +59,12 @@ RUN python3 -m venv /stackable/app \
         statsd \
         pydruid \
         python-ldap \
-        trino[sqlalchemy] \
+        'trino[sqlalchemy]' \
+        # Add optional dependencies for use in custom Superset configurations.
+        # Since https://github.com/stackabletech/superset-operator/pull/530
+        # admins can add custom configuration to superset_conf.py.
+        Flask_OIDC==2.2.0 \
+        Flask-OpenID==1.3.1\
         # Redhat has removed `tzdata` from the ubi-minimal images: see https://bugzilla.redhat.com/show_bug.cgi?id=2223028.
         # Superset relies on ZoneInfo (https://docs.python.org/3/library/zoneinfo.html#data-sources) to resolve time zones, and this is done
         # by searching first under `TZPATH` (which is empty due to the point above) or for the tzdata python package.
@@ -66,7 +75,7 @@ RUN python3 -m venv /stackable/app \
         --upgrade \
         python-json-logger \
         cyclonedx-bom \
-    && if [ ! -z "$AUTHLIB" ]; then pip install Authlib==${AUTHLIB}; fi
+    && if [ -n "$AUTHLIB" ]; then pip install Authlib==${AUTHLIB}; fi
 
 COPY superset/stackable/patches /patches
 RUN /patches/apply_patches.sh ${PRODUCT}
diff --git a/testing-tools/Dockerfile b/testing-tools/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 # Manifest list digest because of multi architecture builds ( https://www.redhat.com/architect/pull-container-image#:~:text=A%20manifest%20list%20exists%20to,system%20on%20a%20specific%20architecture )
 # https://hub.docker.com/_/python/tags
diff --git a/tools/Dockerfile b/tools/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/stackable-base
 
diff --git a/trino-cli/Dockerfile b/trino-cli/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/java-base
 
diff --git a/trino/Dockerfile b/trino/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/java-devel AS storage-connector-builder
 
diff --git a/ubi8-rust-builder/Dockerfile b/ubi8-rust-builder/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 # Deprecation notice: Stackable has moved to UBI9 as of its 24.7 release
 # This builder is kept around and updated until the last SDP release is EOL that uses UBI8 (which is 24.3) so we'll remove this sometime in the summer of 2025
diff --git a/ubi9-rust-builder/Dockerfile b/ubi9-rust-builder/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 # Find the latest version at https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?container-tabs=gti
 # IMPORTANT: Be sure to use the Manifest List Digest for multi-arch support
diff --git a/vector/Dockerfile b/vector/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 FROM stackable/image/stackable-base
 
diff --git a/zookeeper/Dockerfile b/zookeeper/Dockerfile
@@ -1,4 +1,5 @@
 # syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd
+# check=error=true
 
 # ==============================================================================
 # START ZOOKEEPER BUILDER

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd`
	`2`	`+# check=error=true`
`2`	`3`
`3`	`4`	`ARG GIT_SYNC`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`# syntax=docker/dockerfile:1.8.1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd`
	`2`	`+# check=error=true`
	`3`	`+`
`2`	`4`	`#`
`3`	`5`	`# Provides the common Java Runtime for SDP products`
`4`	`6`	`#`