From 84749f06102095c67cde4f007a17af140a8cef49 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 28 Aug 2024 13:53:35 -0400 Subject: [PATCH 1/4] bump to 2.18.1 Signed-off-by: MarkAckert --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index f015fdc74f..be11c98858 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.18.0", + "version": "2.18.1", "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.", "license": "EPL-2.0", "homepage": "https://zowe.org", From 02c10464c4f9f810c795464d4baa5311a800485e Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 30 Aug 2024 13:43:58 -0400 Subject: [PATCH 2/4] container builds use in FROM statements Signed-off-by: MarkAckert --- containers/base-jdk/ubi/Dockerfile | 2 +- containers/base-jdk/ubuntu/Dockerfile | 2 +- containers/base-node/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/containers/base-jdk/ubi/Dockerfile b/containers/base-jdk/ubi/Dockerfile index b87b254888..e4618a38bb 100644 --- a/containers/base-jdk/ubi/Dockerfile +++ b/containers/base-jdk/ubi/Dockerfile @@ -9,7 +9,7 @@ # Copyright Contributors to the Zowe Project. ####################################################################### -FROM zowe-docker-release.jfrog.io/ompzowe/base:latest-ubi +FROM zowe-docker-release.jfrog.io/ompzowe/base:2-ubi ################################## # labels diff --git a/containers/base-jdk/ubuntu/Dockerfile b/containers/base-jdk/ubuntu/Dockerfile index 3ce76a688a..bdb950bbc6 100644 --- a/containers/base-jdk/ubuntu/Dockerfile +++ b/containers/base-jdk/ubuntu/Dockerfile @@ -9,7 +9,7 @@ # Copyright Contributors to the Zowe Project. ####################################################################### -FROM zowe-docker-release.jfrog.io/ompzowe/base:latest-ubuntu +FROM zowe-docker-release.jfrog.io/ompzowe/base:2-ubuntu ################################## # labels diff --git a/containers/base-node/Dockerfile b/containers/base-node/Dockerfile index e3cd778ccd..345a3a3118 100644 --- a/containers/base-node/Dockerfile +++ b/containers/base-node/Dockerfile @@ -10,7 +10,7 @@ ####################################################################### # base image tag -ARG ZOWE_BASE_IMAGE=latest-ubuntu +ARG ZOWE_BASE_IMAGE=2-ubuntu FROM zowe-docker-release.jfrog.io/ompzowe/base:${ZOWE_BASE_IMAGE} From 7a797ba0f29a3f54f4d8843944436dfe7b9c7d59 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 30 Aug 2024 14:13:12 -0400 Subject: [PATCH 3/4] missed launch scripts Signed-off-by: MarkAckert --- containers/zowe-launch-scripts/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/zowe-launch-scripts/Dockerfile b/containers/zowe-launch-scripts/Dockerfile index 4c969ce1d7..4334923c61 100644 --- a/containers/zowe-launch-scripts/Dockerfile +++ b/containers/zowe-launch-scripts/Dockerfile @@ -10,7 +10,7 @@ ####################################################################### # base image tag -ARG ZOWE_BASE_IMAGE=latest-ubuntu +ARG ZOWE_BASE_IMAGE=2-ubuntu FROM zowe-docker-release.jfrog.io/ompzowe/base-node:${ZOWE_BASE_IMAGE} From 56126e3fc8402e1a999c5777928c07fd5bedaf16 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Tue, 3 Sep 2024 15:05:31 -0400 Subject: [PATCH 4/4] add permissions to cicd-test wf Signed-off-by: MarkAckert --- .github/workflows/cicd-test.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index efa37bb2ca..6bbb222e2f 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -1,4 +1,11 @@ name: Zowe CICD Integration Tests + +permissions: + contents: write + issues: write + pull-requests: write + statuses: write + on: workflow_dispatch: inputs: