few improvements

bcgov · Aug 20, 2024 · 0f21a9b · 0f21a9b
1 parent 6b0d2d7
commit 0f21a9b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -84,16 +84,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: bcgov-nr/action-builder-ghcr@v2.0.2
+      - uses: bcgov-nr/action-builder-ghcr@v2.2.0
         with:
           package: ${{ matrix.package }}
-          tag: ${{ needs.semantic-release.outputs.tag }}
+          tag: ${{ needs.semantic-release.outputs.version }}
           token: ${{ secrets.GITHUB_TOKEN }}
           build_file: ${{ matrix.build_file }}
           build_context: ${{ matrix.build_context }}
           triggers: ${{ matrix.triggers }}
           build_args: |
-            APP_VERSION=${{ needs.semantic-release.outputs.tag }}
+            APP_VERSION=${{ needs.semantic-release.outputs.version }}
   helm-release:
     runs-on: ubuntu-22.04
     needs: [builds,semantic-release]

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: bcgov-nr/action-builder-ghcr@v2.0.2
+      - uses: bcgov-nr/action-builder-ghcr@v2.2.0
         with:
           package: ${{ matrix.package }}
           tag: ${{ github.event.number }}
@@ -57,7 +57,7 @@ jobs:
       secret_path_env: dev # this path is different from the path in the broker
     steps:
       - uses: actions/checkout@v4
-      
+
       - name: Deploy to Openshift
         working-directory: charts/nr-oracle-service
         shell: bash

diff --git a/Dockerfile b/Dockerfile
@@ -17,7 +17,7 @@ RUN ./mvnw package -Pnative -DskipTests
 #RUN ./mvnw package -DskipTests for JVM mode
 HEALTHCHECK --interval=300s --timeout=30s CMD ./mvnw --version  || exit 1
 ###
-FROM quay.io/quarkus/quarkus-micro-image:2.0
+FROM quay.io/quarkus/quarkus-micro-image:2.0 as deploy
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \

diff --git a/Dockerfile.certs b/Dockerfile.certs
@@ -1,9 +1,9 @@
 #This Dockerfile mounts the certs
-FROM eclipse-temurin:21.0.4_7-jdk-alpine AS buildCert
+FROM eclipse-temurin:21.0.4_7-jdk-alpine AS build-cert
 
-ENV LANG en_CA.UTF-8
-ENV LANGUAGE en_CA.UTF-8
-ENV LC_ALL en_CA.UTF-8
+ENV LANG=en_CA.UTF-8
+ENV LANGUAGE=en_CA.UTF-8
+ENV LC_ALL=en_CA.UTF-8
 WORKDIR /app
 
 RUN apk --no-cache add openssl