Update CI/CD (#26)

* update frontend pipe Signed-off-by: Nicklas Körtge <[email protected]> * update make file Signed-off-by: Nicklas Körtge <[email protected]> --------- Signed-off-by: Nicklas Körtge <[email protected]>
IBM · Sep 20, 2024 · 1affd03 · 1affd03
1 parent c7cc6f4
commit 1affd03
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -47,7 +47,6 @@ jobs:
         with:
           java-version: '17'
           distribution: 'temurin'
-          cache: maven
       - name: Create Maven settings.xml
         run: |
           echo "<settings>
@@ -69,7 +68,7 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.ORG }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=ref,event=branch
+            type=edge,branch=main
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=sha,format=long

diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
@@ -50,7 +50,7 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.ORG }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=ref,event=branch
+            type=edge,branch=main
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=sha,format=long

diff --git a/Makefile b/Makefile
@@ -6,14 +6,14 @@ build-backend: dev
 # build the docker image for the backend
 build-backend-image: build-backend
 	docker build \
-		-t cbomkit:${CBOMKIT_VERSION} \
+		-t cbomkit:${VERSION} \
 		-f src/main/docker/Dockerfile.jvm \
 		. \
 		--load
 # build the docker image for the frontend
 build-frontend-image:
 	docker build \
-		-t cbomkit-frontend:${CBOMKIT_VERSION} \
+		-t cbomkit-frontend:${VERSION} \
 		-f frontend/docker/Dockerfile \
 		./frontend \
 		--load

diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm
@@ -2,7 +2,6 @@ FROM registry.access.redhat.com/ubi8/openjdk-17:1.19-4.1715070735
 
 ENV LANGUAGE='en_US:en'
 
-
 # We make four distinct layers so if there are application changes the library layers can be re-used
 COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/
 COPY --chown=185 target/quarkus-app/*.jar /deployments/