From 0f21a9b0d5ac6ce2bc0bee8537ca6bccf224b374 Mon Sep 17 00:00:00 2001 From: OMPRAKASH MISHRA Date: Tue, 20 Aug 2024 14:39:10 -0700 Subject: [PATCH] few improvements --- .github/workflows/merge.yml | 6 +++--- .github/workflows/pr-open.yml | 4 ++-- Dockerfile | 2 +- Dockerfile.certs | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index f930eae..aa255a3 100644 --- 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 index b59f6cc..d0cb7f0 100644 --- 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 index 83ed954..64613bc 100644 --- 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 index 4e5a9f2..ecf403d 100644 --- 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