From 245a72102c22a59097e9ac3132ee0ac38b71b17b Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 30 Aug 2024 14:17:03 -0400 Subject: [PATCH 1/2] use `-` instead of latest Signed-off-by: MarkAckert --- container/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/Dockerfile b/container/Dockerfile index da63ed4..0bc5ce8 100644 --- a/container/Dockerfile +++ b/container/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} AS builder From 7d7b02f202018d6fa461688b2575a258e179841d Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Tue, 3 Sep 2024 12:33:47 -0400 Subject: [PATCH 2/2] remove all build-arg-list definitions Signed-off-by: MarkAckert --- .github/workflows/build_test.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 5712788..a95b49a 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -133,8 +133,6 @@ jobs: cpu-arch: amd64 - uses: zowe-actions/shared-actions/docker-build-local@main - with: - build-arg-list: ZOWE_BASE_IMAGE=latest-ubuntu timeout-minutes: 5 build-ubuntu-s390x: @@ -161,7 +159,6 @@ jobs: zlinux-ssh-user: ${{ secrets.ZLINUX_SSH_USER }} zlinux-ssh-key: ${{ secrets.ZLINUX_SSH_KEY }} zlinux-ssh-passphrase: ${{ secrets.ZLINUX_SSH_PASSPHRASE }} - build-arg-list: ZOWE_BASE_IMAGE=latest-ubuntu timeout-minutes: 10 define-ubuntu-manifest: @@ -211,8 +208,6 @@ jobs: redhat-registry-password: ${{ secrets.REDHAT_DEVELOPER_PASSWORD }} - uses: zowe-actions/shared-actions/docker-build-local@main - with: - build-arg-list: ZOWE_BASE_IMAGE=latest-ubi timeout-minutes: 5 build-ubi-s390x: @@ -242,7 +237,6 @@ jobs: redhat-registry: ${{ env.DEFAULT_REDHAT_DOCKER_REGISTRY }} redhat-registry-user: ${{ secrets.REDHAT_DEVELOPER_USER }} redhat-registry-password: ${{ secrets.REDHAT_DEVELOPER_PASSWORD }} - build-arg-list: ZOWE_BASE_IMAGE=latest-ubi timeout-minutes: 10 define-ubi-manifest: