From e0474bc94ebc5969b9844104079385ab01595dc9 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Fri, 26 May 2023 13:57:27 +0200 Subject: [PATCH 1/5] add opa 0.51.0 and make bundle builder version configurable --- image_tools/conf.py | 46 +++++++++++++++++++++++++++------------------ opa/Dockerfile | 4 +++- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/image_tools/conf.py b/image_tools/conf.py index 209656a7..fd7d1cfc 100644 --- a/image_tools/conf.py +++ b/image_tools/conf.py @@ -208,25 +208,35 @@ { "name": "opa", "versions": [ - { - "product": "0.27.1", - "vector": "0.26.0", - }, - { - "product": "0.28.0", - "vector": "0.26.0", - }, - { - "product": "0.37.2", - "vector": "0.26.0", - }, - { - "product": "0.41.0", - "vector": "0.26.0", - }, - { - "product": "0.45.0", + # { + # "product": "0.27.1", + # "vector": "0.26.0", + # "opa_bundle_builder_version": "1.0.0", + # }, + # { + # "product": "0.28.0", + # "vector": "0.26.0", + # "opa_bundle_builder_version": "1.0.0", + # }, + # { + # "product": "0.37.2", + # "vector": "0.26.0", + # "opa_bundle_builder_version": "1.0.0", + # }, + # { + # "product": "0.41.0", + # "vector": "0.26.0", + # "opa_bundle_builder_version": "1.0.0", + # }, + # { + # "product": "0.45.0", + # "vector": "0.26.0", + # "opa_bundle_builder_version": "1.0.0", + # }, + { + "product": "0.51.0", "vector": "0.26.0", + "bundle_builder_version": "1.1.0", }, ], }, diff --git a/opa/Dockerfile b/opa/Dockerfile index f2a67eeb..b97ca5b9 100644 --- a/opa/Dockerfile +++ b/opa/Dockerfile @@ -1,6 +1,8 @@ # syntax=docker/dockerfile:1 FROM stackable/image/vector AS opa-bundle-builder +ARG BUNDLE_BUILDER_VERSION=1.0.0 + # https://github.com/hadolint/hadolint/wiki/DL4006 SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -13,7 +15,7 @@ RUN microdnf update --disablerepo=* --enablerepo=ubi-8-appstream-rpms --enablere WORKDIR / RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -RUN git clone --depth 1 --branch 1.0.0 https://github.com/stackabletech/opa-bundle-builder +RUN git clone --depth 1 --branch ${BUNDLE_BUILDER_VERSION} https://github.com/stackabletech/opa-bundle-builder RUN cd ./opa-bundle-builder && . $HOME/.cargo/env && cargo build --release FROM stackable/image/vector AS multilog-builder From 243504e2278815c6ef0d76dbc3a0631f5f7870f2 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Fri, 26 May 2023 13:58:06 +0200 Subject: [PATCH 2/5] enable all versions --- image_tools/conf.py | 50 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/image_tools/conf.py b/image_tools/conf.py index fd7d1cfc..dafab471 100644 --- a/image_tools/conf.py +++ b/image_tools/conf.py @@ -208,31 +208,31 @@ { "name": "opa", "versions": [ - # { - # "product": "0.27.1", - # "vector": "0.26.0", - # "opa_bundle_builder_version": "1.0.0", - # }, - # { - # "product": "0.28.0", - # "vector": "0.26.0", - # "opa_bundle_builder_version": "1.0.0", - # }, - # { - # "product": "0.37.2", - # "vector": "0.26.0", - # "opa_bundle_builder_version": "1.0.0", - # }, - # { - # "product": "0.41.0", - # "vector": "0.26.0", - # "opa_bundle_builder_version": "1.0.0", - # }, - # { - # "product": "0.45.0", - # "vector": "0.26.0", - # "opa_bundle_builder_version": "1.0.0", - # }, + { + "product": "0.27.1", + "vector": "0.26.0", + "opa_bundle_builder_version": "1.0.0", + }, + { + "product": "0.28.0", + "vector": "0.26.0", + "opa_bundle_builder_version": "1.0.0", + }, + { + "product": "0.37.2", + "vector": "0.26.0", + "opa_bundle_builder_version": "1.0.0", + }, + { + "product": "0.41.0", + "vector": "0.26.0", + "opa_bundle_builder_version": "1.0.0", + }, + { + "product": "0.45.0", + "vector": "0.26.0", + "opa_bundle_builder_version": "1.0.0", + }, { "product": "0.51.0", "vector": "0.26.0", From b9eadc7a4b01b291316a32afbce7891072e259fd Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Fri, 26 May 2023 14:00:35 +0200 Subject: [PATCH 3/5] adapted changelog --- opa/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/opa/CHANGELOG.md b/opa/CHANGELOG.md index 47cbb209..f93e1ca8 100644 --- a/opa/CHANGELOG.md +++ b/opa/CHANGELOG.md @@ -6,9 +6,11 @@ - Add multilog (daemontools) to opa image ([#333]). - Upgraded to the vector base image ([#329]). +- Support OPA version 0.51.0 ([#382]). [#329]: https://github.com/stackabletech/docker-images/pull/329 [#333]: https://github.com/stackabletech/docker-images/pull/333 +[#382]: https://github.com/stackabletech/docker-images/pull/382 ## [opa:0.27.1-stackable0.4.0, opa:0.28.0-stackable0.4.0, opa:0.37.2-stackable0.4.0, opa:0.41.0-stackable0.3.0, opa:0.45.0-stackable0.3.0] - 2022-12-16 From 7e9acc2616af4ed295530e4b64a60ea305cfe967 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Fri, 26 May 2023 14:42:25 +0200 Subject: [PATCH 4/5] Update opa/Dockerfile Co-authored-by: Sebastian Bernauer --- opa/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opa/Dockerfile b/opa/Dockerfile index b97ca5b9..1d1e53f5 100644 --- a/opa/Dockerfile +++ b/opa/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 FROM stackable/image/vector AS opa-bundle-builder -ARG BUNDLE_BUILDER_VERSION=1.0.0 +ARG BUNDLE_BUILDER_VERSION # https://github.com/hadolint/hadolint/wiki/DL4006 SHELL ["/bin/bash", "-o", "pipefail", "-c"] From 10a824b4a4ddcc39ff30bbaa6f6b74f26c0f4d98 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Fri, 26 May 2023 14:46:08 +0200 Subject: [PATCH 5/5] fix bundle builder arg --- image_tools/conf.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/image_tools/conf.py b/image_tools/conf.py index dafab471..7846a5c9 100644 --- a/image_tools/conf.py +++ b/image_tools/conf.py @@ -211,27 +211,27 @@ { "product": "0.27.1", "vector": "0.26.0", - "opa_bundle_builder_version": "1.0.0", + "bundle_builder_version": "1.0.0", }, { "product": "0.28.0", "vector": "0.26.0", - "opa_bundle_builder_version": "1.0.0", + "bundle_builder_version": "1.0.0", }, { "product": "0.37.2", "vector": "0.26.0", - "opa_bundle_builder_version": "1.0.0", + "bundle_builder_version": "1.0.0", }, { "product": "0.41.0", "vector": "0.26.0", - "opa_bundle_builder_version": "1.0.0", + "bundle_builder_version": "1.0.0", }, { "product": "0.45.0", "vector": "0.26.0", - "opa_bundle_builder_version": "1.0.0", + "bundle_builder_version": "1.0.0", }, { "product": "0.51.0",