Merge pull request #78 from lpalashevski/release-fixes

Release fixes

.github/workflows/merge.yml

@@ -73,9 +73,9 @@ jobs:
           tags: odpi/egeria-connector-jdbc:${{ env.CONNECTOR_VERSION }}, odpi/egeria-connector-jdbc:latest, quay.io/odpi/egeria-connector-jdbc:${{ env.CONNECTOR_VERSION }}, quay.io/odpi/egeria-connector-jdbc:latest
           platforms: linux/amd64,linux/arm64
           build-args: |
-            EGERIA_BASE_IMAGE=${{ env.EGERIA_BASE_IMAGE }}
-            CONNECTOR_VERSION=${{ env.CONNECTOR_VERSION }}
-            EGERIA_VERSION=${{ env.EGERIA_VERSION }}
+            egeria_base_image=${{ env.EGERIA_BASE_IMAGE }}
+            connector_version=${{ env.CONNECTOR_VERSION }}
+            egeria_version=${{ env.EGERIA_VERSION }}
       - name: Build and push( to quay.io and docker.io (no tag latest)
         if: ${{ github.ref != 'refs/heads/main'}}
         uses: docker/build-push-action@v4
@@ -85,9 +85,9 @@ jobs:
           tags: odpi/egeria-connector-jdbc:${{ env.CONNECTOR_VERSION }}, quay.io/odpi/egeria-connector-jdbc:${{ env.CONNECTOR_VERSION }}
           platforms: linux/amd64,linux/arm64
           build-args: |
-            EGERIA_BASE_IMAGE=${{ env.EGERIA_BASE_IMAGE }}
-            CONNECTOR_VERSION=${{ env.CONNECTOR_VERSION }}
-            EGERIA_VERSION=${{ env.EGERIA_VERSION }}
+            egeria_base_image=${{ env.EGERIA_BASE_IMAGE }}
+            connector_version=${{ env.CONNECTOR_VERSION }}
+            egeria_version=${{ env.EGERIA_VERSION }}
       # --
       - name: Upload Connector
         uses: actions/upload-artifact@v3

.github/workflows/release.yml

@@ -66,12 +66,12 @@ jobs:
         with:
           context: .
           push: true
-          tags: odpi/egeria-connector-jdbc::${{ env.CONNECTOR_VERSION }}, quay.io/odpi/egeria-connector-jdbc:${{ env.CONNECTOR_VERSION }}
+          tags: odpi/egeria-connector-jdbc:${{ env.CONNECTOR_VERSION }}, quay.io/odpi/egeria-connector-jdbc:${{ env.CONNECTOR_VERSION }}
           platforms: linux/amd64,linux/arm64
           build-args: |
-            EGERIA_BASE_IMAGE=${{ env.EGERIA_BASE_IMAGE }}
-            CONNECTOR_VERSION=${{ env.CONNECTOR_VERSION }}
-            EGERIA_VERSION=${{ env.EGERIA_VERSION }}
+            egeria_base_image=${{ env.EGERIA_BASE_IMAGE }}
+            connector_version=${{ env.CONNECTOR_VERSION }}
+            egeria_version=${{ env.EGERIA_VERSION }}
       # Upload the library so that build results can be viewed
       - name: Upload Connector
         uses: actions/upload-artifact@v3

Dockerfile

@@ -1,13 +1,16 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright Contributors to the Egeria project
 
-# This is the EGERIA version - typically passed from the ci/cd pipeline
-ARG EGERIA_BASE_IMAGE=quay.io/odpi/egeria:latest
-ARG EGERIA_VERSION=latest
+# Image base default for building the connector image
+ARG egeria_base_image=quay.io/odpi/egeria
+# Egeria base image version to extend
+ARG egeria_version=4.1-SNAPSHOT
 # Must be set to help get the right files for the connextors
-
-FROM ${EGERIA_BASE_IMAGE}:${EGERIA_VERSION}
-ARG CONNECTOR_VERSION=0.1-SNAPSHOT
+FROM ${egeria_base_image}:${egeria_version}
+# Egeria connector default version, arg passed from ci/cd will overwrite this value
+ARG connector_version=1.2-SNAPSHOT
+# Default app user defined in the base redhat docker image ubi9/openjdk-17-runtime
+ARG app_user=185
 
 # Labels from https://github.com/opencontainers/image-spec/blob/master/annotations.md#pre-defined-annotation-keys (with additions prefixed    ext)
 # We should inherit all the base labels from the egeria image and only overwrite what is necessary.
@@ -17,10 +20,10 @@ LABEL org.opencontainers.image.description = "Egeria with JDBC connector" \
 # This assumes we only have one uber jar (ensure old versions cleaned out beforehand). Avoids having to pass connector version
 
 # Note that we currently only build a simple jar. If additional dependencies are needed, a jar with dependencies will be needed, or the libraries will need to be added here
-ENV CONNECTOR_VERSION ${CONNECTOR_VERSION}
+ENV CONNECTOR_VERSION $connector_version
 
-COPY jdbc-resource-connector/build/libs/egeria-connector-resource-jdbc-${CONNECTOR_VERSION}.jar /deployments/server/lib
-COPY jdbc-integration-connector/build/libs/egeria-connector-integration-jdbc-${CONNECTOR_VERSION}.jar /deployments/server/lib
+COPY jdbc-resource-connector/build/libs/egeria-connector-resource-jdbc-$connector_version.jar /deployments/server/lib
+COPY jdbc-integration-connector/build/libs/egeria-connector-integration-jdbc-$connector_version.jar /deployments/server/lib
 
 # Add any additional, openly-licensable, connectors here - ensure licenses are added to the LICENSE-Docker.txt
 COPY LICENSE-Docker.txt /deployments/server/LICENSE-JDBC-3RD-PARTY.txt
@@ -30,4 +33,4 @@ USER root
 RUN (cd /deployments/server/lib && curl -O -J https://jdbc.postgresql.org/download/postgresql-42.5.2.jar)
 
 # Restore the standard id for container execution
-USER jboss
+USER $app_user