From f6cbbe974f66cb790c4aa6625dfedb7e6e894b82 Mon Sep 17 00:00:00 2001 From: Jesus Flores Date: Fri, 14 Feb 2025 09:22:06 -0600 Subject: [PATCH 1/3] Allow docker to pull the image based on the host arch --- kafka/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kafka/Dockerfile b/kafka/Dockerfile index a2125dc..6bede23 100644 --- a/kafka/Dockerfile +++ b/kafka/Dockerfile @@ -3,7 +3,7 @@ # The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0. # See the LICENSE and NOTICES files in the project root for more information. -FROM gradle:8.2.1-jdk-focal@sha256:78b95c865c1bcb50ced01501e6a9c6c9bcc181be93c1ea723ff4b58b2f7e9a96 AS build +FROM gradle:8.2.1-jdk-focal@sha256:89b352a0d0d40bb7294cbe5ffd4d9a8824cac6174f9ecc786c0d53ef4663863f AS build COPY --chown=gradle:gradle /ed-fi-kafka-connect-transforms /home/gradle/src WORKDIR /home/gradle/src RUN gradle installDist --no-daemon From 5b6eed29b1b284575b8bd515bd9ff0697b449c34 Mon Sep 17 00:00:00 2001 From: Jesus Flores Date: Fri, 14 Feb 2025 09:24:31 -0600 Subject: [PATCH 2/3] Update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e08bc63..d6fb802 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ This project includes a series of *gradle* tasks: ## Build container -To build the container with a dev tag, simply run `docker build -t edfialliance/ed-fi-kafka-connect:dev .` from the `kafka` directory. +To build the container with a dev tag, simply run `docker build -t edfialliance/ed-fi-kafka-connect:dev --build-context parentdir=../ .` from the `kafka` directory. ## Legal Information From 9d15b7161f5d60a2c55cbc50fd29a25cb0089ddb Mon Sep 17 00:00:00 2001 From: Jesus Flores Date: Wed, 19 Feb 2025 11:58:12 -0600 Subject: [PATCH 3/3] Fix hadolint error --- kafka/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kafka/Dockerfile b/kafka/Dockerfile index 6bede23..4f5fec4 100644 --- a/kafka/Dockerfile +++ b/kafka/Dockerfile @@ -47,7 +47,11 @@ RUN tar -xvf ${opensearch} && \ RUN tar -xvf ${elasticsearch} && \ rm ${elasticsearch} +# Named context support https://github.com/hadolint/hadolint/issues/830 +# hadolint ignore=DL3022 COPY --from=parentdir LICENSE /kafka/connect/EDFI_LICENSE +# Named context support https://github.com/hadolint/hadolint/issues/830 +# hadolint ignore=DL3022 COPY --from=parentdir NOTICES.md /kafka/connect/EDFI_NOTICES.md COPY --from=build /home/gradle/src/build/libs /kafka/connect/ed-fi-kafka-connect-transforms