chore: add zaas for docker publishing (#3662)

--------- Signed-off-by: Pablo Hernán Carle <[email protected]> Co-authored-by: Pablo Hernán Carle <[email protected]>
zowe · Jul 24, 2024 · 00d68b0 · 00d68b0
1 parent b89811f
commit 00d68b0
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/image-publish-branch.yml b/.github/workflows/image-publish-branch.yml
@@ -11,6 +11,7 @@ on:
                 options:
                     - all
                     - zaas-service
+                    - gateway-service
                     - discovery-service
                     - api-catalog-services
                     - caching-service

diff --git a/containers/api-catalog-services/Dockerfile b/containers/api-catalog-services/Dockerfile
@@ -17,7 +17,7 @@ FROM zowe-docker-release.jfrog.io/ompzowe/base-jdk:${ZOWE_BASE_IMAGE} AS builder
 ##################################
 # labels
 LABEL name="API Catalog" \
-      maintainer="carson.cook@ibm.com" \
+      maintainer="pablo.carle@broadcom.com" \
       vendor="Zowe" \
       version="0.0.0" \
       release="0" \

diff --git a/containers/caching-service/Dockerfile b/containers/caching-service/Dockerfile
@@ -17,7 +17,7 @@ FROM zowe-docker-release.jfrog.io/ompzowe/base-jdk:${ZOWE_BASE_IMAGE} AS builder
 ##################################
 # labels
 LABEL name="Caching Service" \
-      maintainer="carson.cook@ibm.com" \
+      maintainer="pablo.carle@broadcom.com" \
       vendor="Zowe" \
       version="0.0.0" \
       release="0" \

diff --git a/containers/discovery-service/Dockerfile b/containers/discovery-service/Dockerfile
@@ -17,7 +17,7 @@ FROM zowe-docker-release.jfrog.io/ompzowe/base-jdk:${ZOWE_BASE_IMAGE} AS builder
 ##################################
 # labels
 LABEL name="Discovery Service" \
-      maintainer="carson.cook@ibm.com" \
+      maintainer="pablo.carle@broadcom.com" \
       vendor="Zowe" \
       version="0.0.0" \
       release="0" \

diff --git a/containers/gateway-service/Dockerfile b/containers/gateway-service/Dockerfile
@@ -17,12 +17,12 @@ FROM zowe-docker-release.jfrog.io/ompzowe/base-jdk:${ZOWE_BASE_IMAGE} AS builder
 ##################################
 # labels
 LABEL name="API Gateway" \
-      maintainer="carson.cook@ibm.com" \
+      maintainer="pablo.carle@broadcom.com" \
       vendor="Zowe" \
       version="0.0.0" \
       release="0" \
       summary="API Mediation Layer Gateway" \
-      description="API Gateway service to route requests to services registered in the API Mediation Layer and provides an API for mainframe security."
+      description="API Gateway service to route requests to services registered in the API Mediation Layer."
 
 ##################################
 # switch context

diff --git a/containers/gateway-service/prepare.sh b/containers/gateway-service/prepare.sh
@@ -46,7 +46,6 @@ buildPackage $gateway_package "packageApiGateway"
 buildApimlCommonPackage
 
 preparePackage $gateway_package
-preparePackage $apiml_common_package "apiml-common-lib"
 prepareBasicFiles
 
 copyToBuildContext $linux_distro $cpu_arch

diff --git a/containers/cloud-gateway-service/Dockerfile → containers/zaas-service/Dockerfile b/containers/cloud-gateway-service/Dockerfile → containers/zaas-service/Dockerfile
@@ -16,13 +16,13 @@ FROM zowe-docker-release.jfrog.io/ompzowe/base-jdk:${ZOWE_BASE_IMAGE} AS builder
 
 ##################################
 # labels
-LABEL name="Gateway" \
-      maintainer="carson.cook@ibm.com" \
+LABEL name="ZAAS" \
+      maintainer="pablo.carle@broadcom.com" \
       vendor="Zowe" \
       version="0.0.0" \
       release="0" \
-      summary="API Mediation Layer Gateway" \
-      description="Gateway service to route requests to services registered in the API Mediation Layer and provides an API for mainframe security."
+      summary="API Mediation Layer ZAAS" \
+      description="Zowe Authentication and Authorization Service provides an API for mainframe security."
 
 ##################################
 # switch context

diff --git a/containers/cloud-gateway-service/prepare.sh → containers/zaas-service/prepare.sh b/containers/cloud-gateway-service/prepare.sh → containers/zaas-service/prepare.sh
@@ -39,13 +39,13 @@ prepareVersioning
 copyDockerfileToInternalStructure $linux_distro $cpu_arch
 cleanUpWorkingFolder
 
-gateway_package="gateway-package"
+zaas_package="zaas-package"
 apiml_common_package="apiml-common-lib-package"
 
-buildPackage $gateway_package "packageGateway"
+buildPackage $zaas_package "packageZaas"
 buildApimlCommonPackage
 
-preparePackage $gateway_package
+preparePackage $zaas_package
 preparePackage $apiml_common_package "apiml-common-lib"
 prepareBasicFiles