Zowe Suite v1.24.0

.github/workflows/docker-source.yml

@@ -0,0 +1,39 @@
+name: Build docker image with sources
+on:
+  workflow_dispatch:
+    inputs:
+      image_tag:
+        description: 'Tag of ompzowe/app-server to use in build'
+        required: true
+      node_version:
+        description: 'Version of nodejs included in the build, ex: 12.19.0'
+        required: true
+
+env:
+  ZOWE_DOCKER_REGISTRY: zowe-docker-snapshot.jfrog.io
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+
+#      - uses: zowe-actions/shared-actions/envvars-global@main
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '12'
+
+      - uses: zowe-actions/shared-actions/docker-sources-local@feature/get-docker-sources
+        with:
+          image-name: zowe-docker-snapshot.jfrog.io/ompzowe/app-server:${{ github.event.inputs.image_tag }}
+          node-version: ${{ github.event.inputs.node_version }}
+          registry-user: ${{ secrets.ARTIFACTORY_USERNAME }}
+          registry-password: ${{ secrets.ARTIFACTORY_PASSWORD }}
+
+      - uses: zowe-actions/shared-actions/docker-build-local@feature/get-docker-sources
+        env:
+          IMAGE_DIRECTORY: ${{ github.workspace }}/docker-build-local
+        with:
+          dockerfile: Dockerfile.sources
+          build-arg-list: IMAGE_NAME=zowe-docker-snapshot.jfrog.io/ompzowe/app-server:${{ github.event.inputs.image_tag }}

.github/workflows/docker.yml

@@ -1,49 +1,61 @@
-# This is a basic workflow to help you get started with Actions
 
-name: CI
+name: app-server build
+
 
-# Controls when the workflow will run
 on:
-  # Triggers the workflow on push or pull request events but only for the staging branch
   push:
     branches: [ master ]
 
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
+env:
+  IMAGE_BASE_DIR: container
+  RELEASE: true
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
+  build-ubuntu:
     runs-on: ubuntu-latest
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
-
-      - name: Login Jfrog
-        uses: docker/login-action@v1
+      - uses: zowe-actions/shared-actions/prepare-workflow@main
+
+      - uses: zowe-actions/shared-actions/docker-prepare@main
         with:
-          registry: zowe-docker-snapshot.jfrog.io
-          username: ${{ secrets.ARTIFACTORY_USERNAME }}
-          password: ${{ secrets.ARTIFACTORY_PASSWORD }}
-
+          registry-user: ${{ secrets.ARTIFACTORY_X_USERNAME }}
+          registry-password: ${{ secrets.ARTIFACTORY_X_PASSWORD }}
+          release: ${{ env.RELEASE }}
+          base-directory: ${{ env.IMAGE_BASE_DIR }}
+          image-name: app-server
+          linux-distro: ubuntu
+          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-zlinux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
 
-      - name: build and push image
-        run: |
-          cd container
-          chmod +x *.sh
-          ./pull-zowe-install-artifacts.sh
-          ./download-zlux.sh
-          cd files
-          IMAGE_VERSION=$(grep -Po '"version": *\K"[^"]*"'  manifest.json | head -n1)
-          IMAGE_VERSION=`echo $IMAGE_VERSION | sed 's/.\(.*\)/\1/' | sed 's/\(.*\)./\1/'`
-          cd ..
-          ./build.sh
-          docker tag zowe-docker-snapshot.jfrog.io/ompzowe/app-server:testing zowe-docker-snapshot.jfrog.io/ompzowe/app-server:$IMAGE_VERSION
-          docker push zowe-docker-snapshot.jfrog.io/ompzowe/app-server:$IMAGE_VERSION
-   
+      - uses: zowe-actions/shared-actions/prepare-workflow@main
+
+      - uses: zowe-actions/shared-actions/docker-prepare@main
+        with:
+          registry-user: ${{ secrets.ARTIFACTORY_X_USERNAME }}
+          registry-password: ${{ secrets.ARTIFACTORY_X_PASSWORD }}
+          release: ${{ env.RELEASE }}
+          base-directory: ${{ env.IMAGE_BASE_DIR }}
+          image-name: app-server
+          linux-distro: ubuntu
+          cpu-arch: s390x
+
+      - uses: zowe-actions/shared-actions/docker-build-zlinux@main
+        with:
+          zlinux-host: ${{ secrets.ZLINUX_HOST }}
+          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

container/.gitignore

@@ -1,4 +1,8 @@
 *.tar
-files/zlux
+files/
+tmp/
 # manifest.json
-logs
+logs
+# Dockerfile
+ubuntu/
+ubi/

container/Dockerfile.zlux

@@ -9,10 +9,23 @@
 # Copyright IBM Corporation 2021                                                        #
 #                                                                                       #
 #########################################################################################
-FROM node:12
+# base image tag
+ARG ZOWE_BASE_IMAGE=latest-ubuntu
+
+FROM zowe-docker-release.jfrog.io/ompzowe/base-node:${ZOWE_BASE_IMAGE} AS builder
+
+##################################
+# labels
+LABEL name="App Server" \
+      maintainer="[email protected]" \
+      vendor="Zowe" \
+      version="0.0.0" \
+      release="0" \
+      description="This Zowe UI component can display jobs running on z/OS"
+
 
 #ENV VARS
-ENV INSTALL_DIR=/home/zowe
+ENV INSTALL_DIR=/component
 ENV ROOT_DIR=${INSTALL_DIR}/install
 ENV ZOWE_ROOT_DIR=${ROOT_DIR}
 ENV INSTANCE_DIR=${INSTALL_DIR}/instance

container/build.sh

@@ -13,5 +13,5 @@
 #########################################################################################
 
 mkdir -p logs
-docker pull node:12
+docker pull zowe-docker-release.jfrog.io/ompzowe/base-node:latest-ubuntu
 docker build --pull -f Dockerfile.zlux --no-cache --progress=plain -t zowe-docker-snapshot.jfrog.io/ompzowe/app-server:testing . 2>&1 | tee logs/docker-build.log