OSDU-GCP: parametrize containerization stage

NOTICE

@@ -264,7 +264,6 @@ The following software have components provided under the terms of this license:
 - Plexus :: Default Container (from )
 - Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
 - jaxen (from http://jaxen.codehaus.org/)
-- oro (from )
 
 ========================================================================
 BSD-3-Clause
@@ -304,30 +303,36 @@ CC-BY-2.5
 The following software have components provided under the terms of this license:
 
 - Checker Qual (from https://checkerframework.org)
+- FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
 
 ========================================================================
-CC-BY-3.0
+CDDL-1.0
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
+- Java EE Transaction API (from http://jcp.org/en/jsr/detail?id=907)
+- JavaMail API (from )
+- Servlet Specification 2.5 API (from )
 
 ========================================================================
-CDDL-1.0
+CDDL-1.1
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Java EE Transaction API (from http://jcp.org/en/jsr/detail?id=907)
 - JavaBeans(TM) Activation Framework (from http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp)
-- JavaMail API (from )
-- Servlet Specification 2.5 API (from )
 
 ========================================================================
-EPL-1.0
+CPL-1.0
 ========================================================================
 The following software have components provided under the terms of this license:
 
 - JUnit (from http://junit.org)
+
+========================================================================
+EPL-1.0
+========================================================================
+The following software have components provided under the terms of this license:
+
 - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
 - Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket)
 - Java Servlet API (from https://projects.eclipse.org/projects/ee4j.servlet)
@@ -509,7 +514,6 @@ The following software have components provided under the terms of this license:
 - JTidy (from http://jtidy.sourceforge.net)
 - LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
 - Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
-- xml-apis (from )
 
 ========================================================================
 SISSL-1.2
@@ -553,6 +557,7 @@ The following software have components provided under the terms of this license:
 - LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
 - Project Lombok (from https://projectlombok.org)
 - Spring Web (from https://github.com/spring-projects/spring-framework)
+- xml-apis (from )
 
 ========================================================================
 unknown
@@ -560,6 +565,7 @@ unknown
 The following software have components provided under the terms of this license:
 
 - Byte Buddy (without dependencies) (from )
+- JUnit (from http://junit.org)
 - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
 - JavaBeans Activation Framework API jar (from )
 - JavaMail API (from )
@@ -572,5 +578,3 @@ The following software have components provided under the terms of this license:
 - org.junit.platform:junit-platform-engine (from http://junit.org/junit5/)
 - org.junit.vintage:junit-vintage-engine (from http://junit.org/junit5/)
 - xml-apis (from )
-
-

provider/crs-catalog-gcp/cloudbuild/cloudbuild.yaml

@@ -20,11 +20,11 @@ steps:
             'build',
             '--build-arg', 'PROVIDER_NAME=${_PROVIDER_NAME}',
             '--build-arg', 'PORT=${_PORT}',
-            '-t', 'gcr.io/$PROJECT_ID/os-crs-catalog/crs-catalog-${_PROVIDER_NAME}:${_SHORT_SHA}',
-            '-t', 'gcr.io/$PROJECT_ID/os-crs-catalog/crs-catalog-${_PROVIDER_NAME}:latest',
-            '-f', 'provider/crs-catalog-${_PROVIDER_NAME}/cloudbuild/Dockerfile.cloudbuild',
+            '-t', 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GCP_SERVICE}-${_PROVIDER_NAME}:${_SHORT_SHA}',
+            '-t', 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GCP_SERVICE}-${_PROVIDER_NAME}:latest',
+            '-f', 'provider/${_GCP_SERVICE}-${_PROVIDER_NAME}/cloudbuild/Dockerfile.cloudbuild',
             '.'
     ]
 
 images:
-  - 'gcr.io/$PROJECT_ID/os-crs-catalog/crs-catalog-${_PROVIDER_NAME}'
+  - 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GCP_SERVICE}-${_PROVIDER_NAME}'