Skip to content

Commit

Permalink
Merge pull request #197 from zowe/user/markackert/v2-docker-build-update
Browse files Browse the repository at this point in the history
Update v2 containers build
  • Loading branch information
MarkAckert authored Sep 3, 2024
2 parents 6ab4d08 + 7d7b02f commit f618a09
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit f618a09

Please sign in to comment.