From 9783d913fecaeca40a8ddf77cae6830ab64526ff Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulushc@gmail.com>
Date: Wed, 18 Sep 2024 12:06:07 -0700
Subject: [PATCH] chore: docs and fixes (#58)

* docs: updating documentation

* feat: added retag to image

* feat: skipping cert extract if using insecure port

* chore: adding remove before publishing new version

* chore: fixing legacy labels
---
 .github/workflows/merge-main.yml | 20 ++++++++++++++++++++
 .github/workflows/pr-close.yml   |  1 -
 certextractor/Dockerfile         | 22 +++++++++++-----------
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml
index b9c1cb1..d84014c 100644
--- a/.github/workflows/merge-main.yml
+++ b/.github/workflows/merge-main.yml
@@ -59,6 +59,16 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Removing old core
+        uses: paulushcgcj/delete-github-package@1.0.0
+        continue-on-error: true
+        with:
+          token: ${{ secrets.PAT }}
+          type: maven
+          name: ca.bc.gov.nrs-commons.forest-client-core
+          version: ${{ needs.vars.outputs.semver }}
+          user: ${{ github.repository_owner }}
+
       - name: Publish Core
         uses: paulushcgcj/action-java-publish@v0.1.1
         with:
@@ -79,6 +89,16 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Removing old spring
+        uses: paulushcgcj/delete-github-package@1.0.0
+        continue-on-error: true
+        with:
+          token: ${{ secrets.PAT }}
+          type: maven
+          name: ca.bc.gov.nrs-commons.forest-client-spring
+          version: ${{ needs.vars.outputs.semver }}
+          user: ${{ github.repository_owner }}
+
       - name: Publish Spring
         uses: paulushcgcj/action-java-publish@v0.1.1
         with:          
diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml
index 3375363..bf31d9c 100644
--- a/.github/workflows/pr-close.yml
+++ b/.github/workflows/pr-close.yml
@@ -75,4 +75,3 @@ jobs:
           name: ca.bc.gov.nrs-commons.forest-client-spring
           version: ${{ needs.vars.outputs.semver }}.PR${{ github.event.number }}
           user: ${{ github.repository_owner }}
-
diff --git a/certextractor/Dockerfile b/certextractor/Dockerfile
index 3cefeb2..cd47890 100644
--- a/certextractor/Dockerfile
+++ b/certextractor/Dockerfile
@@ -3,17 +3,17 @@ FROM eclipse-temurin:17.0.12_7-jdk-alpine
 ARG BUILD_DATE
 ARG VERSION
 
-LABEL org.opencontainers.image.created "$BUILD_DATE"
-LABEL org.opencontainers.image.authors "Natural Resource Information and Digital Services"
-LABEL org.opencontainers.image.url "https://github.com/bcgov/nr-forest-client-commons/pkgs/container/nr-forest-client-commons%2Fcertextractor"
-LABEL org.opencontainers.image.documentation "https://github.com/bcgov/nr-forest-client-commons/wiki"
-LABEL org.opencontainers.image.source "https://github.com/bcgov/nr-forest-client-commons"
-LABEL org.opencontainers.image.version "$VERSION"
-LABEL org.opencontainers.image.licenses "Apache-2.0"
-LABEL org.opencontainers.image.title "Oracle Database Client Certificate Extractor"
-LABEL org.opencontainers.image.vendor "Government of British Columbia"
-LABEL org.opencontainers.image.description "Extracts the Oracle Database Client certificates from the Oracle connection and adds them to the Java Truststore."
-LABEL org.opencontainers.image.base.name "eclipse-temurin:17.0.11_9-jdk-alpine"
+LABEL org.opencontainers.image.created="$BUILD_DATE"
+LABEL org.opencontainers.image.authors="Natural Resource Information and Digital Services"
+LABEL org.opencontainers.image.url="https://github.com/bcgov/nr-forest-client-commons/pkgs/container/nr-forest-client-commons%2Fcertextractor"
+LABEL org.opencontainers.image.documentation="https://github.com/bcgov/nr-forest-client-commons/wiki"
+LABEL org.opencontainers.image.source="https://github.com/bcgov/nr-forest-client-commons"
+LABEL org.opencontainers.image.version="$VERSION"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.title="Oracle Database Client Certificate Extractor"
+LABEL org.opencontainers.image.vendor="Government of British Columbia"
+LABEL org.opencontainers.image.description="Extracts the Oracle Database Client certificates from the Oracle connection and adds them to the Java Truststore."
+LABEL org.opencontainers.image.base.name="eclipse-temurin:17.0.11_9-jdk-alpine"
 
 ENV LANG en_CA.UTF-8
 ENV LANGUAGE en_CA.UTF-8