Merge pull request #171 from catenax-ng/hotfix/deployment

Hotfix/deployment
catenax-ng · Feb 17, 2023 · 3401f1d · 3401f1d
2 parents 2a58b5f + 037f5c3
commit 3401f1d
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 14 deletions.
diff --git a/.github/workflows/publish-consumer-backend-docker-images.yml b/.github/workflows/publish-consumer-backend-docker-images.yml
@@ -23,7 +23,8 @@ on:
   push:
 
     branches: [ "main", "develop" ]
-
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
     # Publish semver tags as releases.
     # tags: [ 'v*.*.*' ]
 
@@ -82,5 +83,5 @@ jobs:
         with:
           context: consumer-backend/productpass
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: ${{ steps.meta.outputs.tags }}, ${{ env.REGISTRY }}/${{ github.repository }}/${{ env.IMAGE_NAME }}:latest
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/publish-consumer-ui-docker-images.yml b/.github/workflows/publish-consumer-ui-docker-images.yml
@@ -21,11 +21,9 @@ name: "Publish Consumer UI Docker Images"
 
 on:
   push:
-
     branches: [ "main", "develop" ]
-
-    # Publish semver tags as releases.
-    # tags: [ 'v*.*.*' ]
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
 
 env:
   REGISTRY: ghcr.io
@@ -72,5 +70,5 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: ${{ steps.meta.outputs.tags }}, ${{ env.REGISTRY }}/${{ github.repository }}/${{ env.IMAGE_NAME }}:latest
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/charts/consumer-backend/Chart.yaml b/charts/consumer-backend/Chart.yaml
@@ -29,7 +29,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.9
+version: 0.2.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/consumer-backend/values.yaml b/charts/consumer-backend/values.yaml
@@ -24,8 +24,6 @@ namespace: product-material-pass
 image:
   repository: ghcr.io/catenax-ng/product-battery-passport-consumer-app/product-pass-consumer-backend
   pullPolicy: Always
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: placeholder
 
 imagePullSecrets: []
 nameOverride: "consumer-backend"

diff --git a/charts/consumer-ui/Chart.yaml b/charts/consumer-ui/Chart.yaml
@@ -29,7 +29,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.9
+version: 0.2.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/consumer-ui/values.yaml b/charts/consumer-ui/values.yaml
@@ -22,8 +22,6 @@ namespace: product-material-pass
 image:
   repository: ghcr.io/catenax-ng/product-battery-passport-consumer-app/consumer-ui
   pullPolicy: Always
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: placeholder
 
 imagePullSecrets: []
 nameOverride: "consumer-ui"

diff --git a/src/services/service.const.js b/src/services/service.const.js
@@ -98,4 +98,3 @@ else { // for local run
 }
 
 export {TWIN_REGISTRY_URL, AAS_PROXY_URL, MOCK_AUTH_URL, GOOGLE_CHART_API_URL, DUMMY_SERVICE, INIT_OPTIONS, REDIRECT_URI, CX_REGISTRY_URL, SERVER_URL, API_KEY, CLIENT_CREDENTIALS, IDP_URL, BACKEND, VERSION, API_TIMEOUT, API_DELAY, API_MAX_RETRIES};
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -98,4 +98,3 @@ else { // for local run
		}

		export {TWIN_REGISTRY_URL, AAS_PROXY_URL, MOCK_AUTH_URL, GOOGLE_CHART_API_URL, DUMMY_SERVICE, INIT_OPTIONS, REDIRECT_URI, CX_REGISTRY_URL, SERVER_URL, API_KEY, CLIENT_CREDENTIALS, IDP_URL, BACKEND, VERSION, API_TIMEOUT, API_DELAY, API_MAX_RETRIES};