From 9bfe00c69ff05c6fa8b4e7839e34d5c39612d860 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 22 May 2023 12:11:21 +0200 Subject: [PATCH 1/7] Added EDC Dockerfile --- edc/Dockerfile | 26 ++++++++++++++++++++++++++ edc/README.md | 6 ++++++ image_tools/conf.py | 9 +++++++++ 3 files changed, 41 insertions(+) create mode 100644 edc/Dockerfile create mode 100644 edc/README.md diff --git a/edc/Dockerfile b/edc/Dockerfile new file mode 100644 index 000000000..427e7bbc9 --- /dev/null +++ b/edc/Dockerfile @@ -0,0 +1,26 @@ +# syntax=docker/dockerfile:1 +FROM stackable/image/java-base + +ARG PRODUCT +ARG RELEASE + +LABEL name="Hello World" \ + maintainer="info@stackable.de" \ + vendor="Stackable GmbH" \ + version="${PRODUCT}" \ + release="${RELEASE}" \ + summary="The Stackable image for Apache Druid." \ + description="This image is deployed by the Stackable Operator for Apache Druid." + +# https://github.com/hadolint/hadolint/wiki/DL4006 +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + +RUN microdnf update && \ + microdnf clean all + +USER stackable +WORKDIR /stackable + +RUN curl -L https://repo.stackable.tech/repository/packages/edc/dataspace-connector.jar -o connector.jar + +ENTRYPOINT java -Dedc.keystore=./mount/cert/cert.pfx -Dedc.keystore.password=123456 -Dedc.vault=./mount/cert/vault.properties -jar -Dedc.fs.config=./mount/config/config.properties ./connector.jar \ No newline at end of file diff --git a/edc/README.md b/edc/README.md new file mode 100644 index 000000000..a5d9f49f8 --- /dev/null +++ b/edc/README.md @@ -0,0 +1,6 @@ + + +https://github.com/stackabletech/edc-operator/ + +https://github.com/stackabletech/edc-operator/tree/main/edc-connector + diff --git a/image_tools/conf.py b/image_tools/conf.py index d4b8d6e92..a8d9ea708 100644 --- a/image_tools/conf.py +++ b/image_tools/conf.py @@ -49,6 +49,15 @@ }, ], }, + { + "name": "edc", + "versions": [ + { + "product": "0.0.1-SNAPSHOT", + "java-base": "17", + }, + ], + }, { "name": "hadoop", "versions": [ From 1bededabd481e1b5d9d629f8a47bc664e2846a2d Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 22 May 2023 12:19:17 +0200 Subject: [PATCH 2/7] Updated README --- edc/README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/edc/README.md b/edc/README.md index a5d9f49f8..c6c258c60 100644 --- a/edc/README.md +++ b/edc/README.md @@ -1,6 +1,7 @@ +# EDC Connector Image - -https://github.com/stackabletech/edc-operator/ - -https://github.com/stackabletech/edc-operator/tree/main/edc-connector - +Links: +- [The official Connector repo](https://github.com/eclipse-edc/Connector) +- [The IONOS S3 extension](https://github.com/Digital-Ecosystems/edc-ionos-s3) +- [Our EDC Operator](https://github.com/stackabletech/edc-operator/) +- [The EDC Connector build - our own](https://github.com/stackabletech/edc-operator/tree/main/edc-connector) based off of the IONOS Repo. From e7aaad0268f8d48ef16f024368cb519c35d73d7b Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 22 May 2023 12:20:29 +0200 Subject: [PATCH 3/7] Updated README --- edc/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/edc/README.md b/edc/README.md index c6c258c60..770e58a8c 100644 --- a/edc/README.md +++ b/edc/README.md @@ -1,6 +1,7 @@ # EDC Connector Image Links: + - [The official Connector repo](https://github.com/eclipse-edc/Connector) - [The IONOS S3 extension](https://github.com/Digital-Ecosystems/edc-ionos-s3) - [Our EDC Operator](https://github.com/stackabletech/edc-operator/) From 7cf4b738d86ed8622fe5182336a7dd6f6a1e0767 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Tue, 23 May 2023 15:01:32 +0200 Subject: [PATCH 4/7] switched from entrypoint to cmd --- edc/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edc/Dockerfile b/edc/Dockerfile index 427e7bbc9..213a48888 100644 --- a/edc/Dockerfile +++ b/edc/Dockerfile @@ -23,4 +23,4 @@ WORKDIR /stackable RUN curl -L https://repo.stackable.tech/repository/packages/edc/dataspace-connector.jar -o connector.jar -ENTRYPOINT java -Dedc.keystore=./mount/cert/cert.pfx -Dedc.keystore.password=123456 -Dedc.vault=./mount/cert/vault.properties -jar -Dedc.fs.config=./mount/config/config.properties ./connector.jar \ No newline at end of file +CMD ["java", "-Dedc.keystore=./mount/cert/cert.pfx", "-Dedc.keystore.password=123456", "-Dedc.vault=./mount/cert/vault.properties", "-Dedc.fs.config=./mount/config/config.properties", "-jar", "connector.jar" ] From 613f3acc2027f5f8b981e5340a4cf5b32c4c4635 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Thu, 1 Jun 2023 09:45:20 +0200 Subject: [PATCH 5/7] added versioning with commit hashes --- edc/Dockerfile | 4 ++-- image_tools/conf.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/edc/Dockerfile b/edc/Dockerfile index 213a48888..673888787 100644 --- a/edc/Dockerfile +++ b/edc/Dockerfile @@ -21,6 +21,6 @@ RUN microdnf update && \ USER stackable WORKDIR /stackable -RUN curl -L https://repo.stackable.tech/repository/packages/edc/dataspace-connector.jar -o connector.jar +RUN curl -L https://repo.stackable.tech/repository/packages/edc/dataspace-connector-${PRODUCT}.jar -o connector.jar -CMD ["java", "-Dedc.keystore=./mount/cert/cert.pfx", "-Dedc.keystore.password=123456", "-Dedc.vault=./mount/cert/vault.properties", "-Dedc.fs.config=./mount/config/config.properties", "-jar", "connector.jar" ] +CMD ["java", "-Dedc.fs.config=./mount/config/config.properties", "-jar", "connector.jar" ] diff --git a/image_tools/conf.py b/image_tools/conf.py index f9ab9f578..658c695c4 100644 --- a/image_tools/conf.py +++ b/image_tools/conf.py @@ -53,7 +53,7 @@ "name": "edc", "versions": [ { - "product": "0.0.1-SNAPSHOT", + "product": "77c6e17", "java-base": "17", }, ], From 0a3f90022c483b8350cd3cdaf3dff4814e2dd196 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Wed, 16 Aug 2023 09:37:13 +0200 Subject: [PATCH 6/7] some changes --- edc/Dockerfile | 8 ++++---- edc/README.md | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/edc/Dockerfile b/edc/Dockerfile index 673888787..9543bd9de 100644 --- a/edc/Dockerfile +++ b/edc/Dockerfile @@ -4,13 +4,13 @@ FROM stackable/image/java-base ARG PRODUCT ARG RELEASE -LABEL name="Hello World" \ - maintainer="info@stackable.de" \ +LABEL name="EDC" \ + maintainer="info@stackable.tech" \ vendor="Stackable GmbH" \ version="${PRODUCT}" \ release="${RELEASE}" \ - summary="The Stackable image for Apache Druid." \ - description="This image is deployed by the Stackable Operator for Apache Druid." + summary="The Stackable image for the EDC." \ + description="This image is deployed by the Stackable Operator for the EDC." # https://github.com/hadolint/hadolint/wiki/DL4006 SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/edc/README.md b/edc/README.md index 770e58a8c..c74165ed8 100644 --- a/edc/README.md +++ b/edc/README.md @@ -1,4 +1,6 @@ -# EDC Connector Image +# Technology Preview: EDC Connector Image + +This image is in an experimental state and only provided as a technology preview component. Links: From ffc8bb3ede5f1ad845e4fbf478b7dd665c8783c0 Mon Sep 17 00:00:00 2001 From: Felix Hennig Date: Mon, 21 Aug 2023 14:21:15 +0200 Subject: [PATCH 7/7] updated version --- image_tools/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image_tools/conf.py b/image_tools/conf.py index 164ccdfb1..c0f2d1e84 100644 --- a/image_tools/conf.py +++ b/image_tools/conf.py @@ -81,7 +81,7 @@ "name": "edc", "versions": [ { - "product": "77c6e17", + "product": "0.1.2-ionos-technology-preview", "java-base": "17", }, ],