Skip to content

Commit

Permalink
Merge pull request #196 from zowe/user/markackert/v3-container-build
Browse files Browse the repository at this point in the history
Update v3 containers
  • Loading branch information
MarkAckert authored Sep 3, 2024
2 parents 7fc584d + a8eab58 commit 6858e6f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,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 @@ -165,7 +163,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 @@ -215,8 +212,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 @@ -246,7 +241,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
14 changes: 7 additions & 7 deletions container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
#######################################################################

# base image tag
ARG ZOWE_BASE_IMAGE=latest-ubuntu
ARG ZOWE_BASE_IMAGE=3-ubuntu

FROM zowe-docker-release.jfrog.io/ompzowe/base-node:${ZOWE_BASE_IMAGE} AS builder

##################################
# labels
LABEL name="USS Explorer" \
maintainer="[email protected]" \
vendor="Zowe" \
version="0.0.0" \
release="0" \
summary="IBM z/OS Unix Files UI service" \
description="This Zowe UI component can display unix files on z/OS"
maintainer="[email protected]" \
vendor="Zowe" \
version="0.0.0" \
release="0" \
summary="IBM z/OS Unix Files UI service" \
description="This Zowe UI component can display unix files on z/OS"

##################################
# switch context
Expand Down

0 comments on commit 6858e6f

Please sign in to comment.