Merge pull request #88 from catenax-ng/chore/TRACEFOSS-1029-renaming-images

fix: TRACEFOSS-1029 Updated image names to match tag of image convent…

Author: ds-mwesener

.github/workflows/docker-image-branch_frontend.yml

@@ -38,4 +38,4 @@ jobs:
         with:
           context: frontend/
           push: true
-          tags: ${{ env.REGISTRY }}/${{ github.repository }}:fe_${{ github.event.pull_request.head.sha }}
+          tags: ${{ env.REGISTRY }}/${{ github.repository }}-frontend:${{ github.event.pull_request.head.sha }}

.github/workflows/docker-image-main_backend.yml

@@ -34,5 +34,5 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build & Push docker image ${{ env.REGISTRY }}/${{ github.repository }}:be_${{ env.COMMIT_SHA }}
-        run: mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode -DskipTests=true install jib:build -Dimage=${{ env.REGISTRY }}/${{ github.repository }}:be_${{ env.COMMIT_SHA }}
+      - name: Build & Push docker image ${{ env.REGISTRY }}/${{ github.repository }}:${{ env.COMMIT_SHA }}
+        run: mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode -DskipTests=true install jib:build -Dimage=${{ env.REGISTRY }}/${{ github.repository }}:${{ env.COMMIT_SHA }}

.github/workflows/docker-image-main_frontend.yml

@@ -34,4 +34,4 @@ jobs:
         with:
           context: frontend/
           push: true
-          tags: ${{ env.REGISTRY }}/${{ github.repository }}:fe_latest , ${{ env.REGISTRY }}/${{ github.repository }}:fe_${{ github.sha }}
+          tags: ${{ env.REGISTRY }}/${{ github.repository }}-frontend:latest , ${{ env.REGISTRY }}/${{ github.repository }}-frontend:${{ github.sha }}

.github/workflows/docker-image-tag-release.yaml

@@ -33,12 +33,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and push ${{ env.REGISTRY }}/${{ github.repository }}:fe_${{ env.TAG_NAME }} and :fe_latest
+      - name: Build and push ${{ env.REGISTRY }}/${{ github.repository }}-frontend:${{ env.TAG_NAME }} and :latest
         uses: docker/build-push-action@v4
         with:
           context: frontend
           push: true
-          tags: ${{ env.REGISTRY }}/${{ github.repository }}:fe_${{ env.TAG_NAME }}, ${{ env.REGISTRY }}/${{ github.repository }}:fe_latest
+          tags: ${{ env.REGISTRY }}/${{ github.repository }}-frontend:${{ env.TAG_NAME }}, ${{ env.REGISTRY }}/${{ github.repository }}-frontend:latest
 
   Release-docker-image-backend:
     runs-on: ubuntu-latest
@@ -71,11 +71,11 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build & push docker image ${{ env.REGISTRY }}/${{ github.repository }}:be_${{ env.TAG_NAME }}
-        run: mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode -DskipTests=true install jib:build -Dimage=${{ env.REGISTRY }}/${{ github.repository }}:be_${{ env.TAG_NAME }}
+      - name: Build & push docker image ${{ env.REGISTRY }}/${{ github.repository }}:${{ env.TAG_NAME }}
+        run: mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode -DskipTests=true install jib:build -Dimage=${{ env.REGISTRY }}/${{ github.repository }}:${{ env.TAG_NAME }}
 
-      - name: Tag docker image ${{ env.REGISTRY }}/${{ github.repository }}:be_latest
-        run: docker tag ${{ env.REGISTRY }}/${{ github.repository }}:be_${{ env.TAG_NAME }} ${{ env.REGISTRY }}/${{ github.repository }}:be_latest
+      - name: Tag docker image ${{ env.REGISTRY }}/${{ github.repository }}:latest
+        run: docker tag ${{ env.REGISTRY }}/${{ github.repository }}-backend:${{ env.TAG_NAME }} ${{ env.REGISTRY }}/${{ github.repository }}:latest
 
-      - name: Push docker image ${{ env.REGISTRY }}/${{ github.repository }}:be_latest
-        run: docker push ${{ env.REGISTRY }}/${{ github.repository }}:be_latest
+      - name: Push docker image ${{ env.REGISTRY }}/${{ github.repository }}:latest
+        run: docker push ${{ env.REGISTRY }}/${{ github.repository }}:latest

.github/workflows/pull-request_backend.yml

@@ -89,7 +89,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push docker image
-        run: mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode -DskipTests=true install jib:build -Dimage=${{ env.REGISTRY }}/${{ github.repository }}:be_${{ env.COMMIT_SHA }}
+        run: mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode -DskipTests=true install jib:build -Dimage=${{ env.REGISTRY }}/${{ github.repository }}:${{ env.COMMIT_SHA }}
 
   Dependency-analysis:
     runs-on: ubuntu-latest

backend/charts/traceability-foss-backend/templates/deployment.yaml

@@ -40,7 +40,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:be_{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             - name: SPRING_PROFILES_ACTIVE

frontend/charts/traceability-foss-frontend/templates/deployment.yaml

@@ -40,7 +40,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:fe_{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.repository }}-frontend:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             - name: CATENAX_PORTAL_API_URL