Merge pull request #299 from bcgov/chore/remove-dockerhub

Remove DockerHub from pipeline

Author: TimCsaky

.github/actions/build-push-container/action.yaml

@@ -15,16 +15,6 @@ inputs:
   github_token:
     description: Github Container Registry Authorization Token
     required: true
-  dockerhub_username:
-    description: Dockerhub Container Registry Username
-    required: false
-  dockerhub_organization:
-    description: Dockerhub Container Registry Organization
-    required: false
-    default: bcgovimages
-  dockerhub_token:
-    description: Dockerhub Container Registry Authorization Token
-    required: false
 
 runs:
   using: composite
@@ -36,7 +26,6 @@ runs:
       shell: bash
       run: |
         echo "GH_USERNAME=$(tr '[:upper:]' '[:lower:]' <<< '${{ inputs.github_username }}')" >> $GITHUB_ENV
-        echo "HAS_DOCKERHUB=${{ fromJson(inputs.dockerhub_username != '' && inputs.dockerhub_token != '') }}" >> $GITHUB_ENV
 
     - name: Login to Github Container Registry
       uses: docker/login-action@v3
@@ -45,21 +34,12 @@ runs:
         username: ${{ env.GH_USERNAME }}
         password: ${{ inputs.github_token }}
 
-    - name: Login to Dockerhub Container Registry
-      if: env.HAS_DOCKERHUB == 'true'
-      uses: docker/login-action@v3
-      with:
-        registry: docker.io
-        username: ${{ inputs.dockerhub_username }}
-        password: ${{ inputs.dockerhub_token }}
-
     - name: Prepare Container Metadata tags
       id: meta
       uses: docker/metadata-action@v5
       with:
         images: |
           ghcr.io/${{ env.GH_USERNAME }}/${{ inputs.image_name }}
-          docker.io/${{ inputs.dockerhub_organization }}/${{ inputs.image_name }},enable=${{ env.HAS_DOCKERHUB }}
         # Always updates the 'latest' tag
         flavor: |
           latest=true

.github/workflows/on-push.yaml

@@ -31,8 +31,6 @@ jobs:
           image_name: ${{ env.APP_NAME }}
           github_username: ${{ github.repository_owner }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
 
   deploy-dev:
     name: Deploy to Dev

README.md

@@ -7,10 +7,6 @@
 [![Maintainability](https://api.codeclimate.com/v1/badges/91d2b0aebc348a1d5d0a/maintainability)](https://codeclimate.com/github/bcgov/common-object-management-service/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/91d2b0aebc348a1d5d0a/test_coverage)](https://codeclimate.com/github/bcgov/common-object-management-service/test_coverage)
 
-[![version](https://img.shields.io/docker/v/bcgovimages/common-object-management-service.svg?sort=semver)](https://hub.docker.com/r/bcgovimages/common-object-management-service)
-[![pulls](https://img.shields.io/docker/pulls/bcgovimages/common-object-management-service.svg)](https://hub.docker.com/r/bcgovimages/common-object-management-service)
-[![size](https://img.shields.io/docker/image-size/bcgovimages/common-object-management-service.svg)](https://hub.docker.com/r/bcgovimages/common-object-management-service)
-
 A microservice for managing access control to S3 Objects
 
 To learn more about the **Common Services** available visit the [Common Services Showcase](https://bcgov.github.io/common-service-showcase/) page.

app/README.md

@@ -6,10 +6,6 @@
 [![Maintainability](https://api.codeclimate.com/v1/badges/91d2b0aebc348a1d5d0a/maintainability)](https://codeclimate.com/github/bcgov/common-object-management-service/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/91d2b0aebc348a1d5d0a/test_coverage)](https://codeclimate.com/github/bcgov/common-object-management-service/test_coverage)
 
-[![version](https://img.shields.io/docker/v/bcgovimages/common-object-management-service.svg?sort=semver)](https://hub.docker.com/r/bcgovimages/common-object-management-service)
-[![pulls](https://img.shields.io/docker/pulls/bcgovimages/common-object-management-service.svg)](https://hub.docker.com/r/bcgovimages/common-object-management-service)
-[![size](https://img.shields.io/docker/image-size/bcgovimages/common-object-management-service.svg)](https://hub.docker.com/r/bcgovimages/common-object-management-service)
-
 A microservice for managing access control to S3 Objects
 
 To learn more about the **Common Services** available visit the [Common Services Showcase](https://bcgov.github.io/common-service-showcase/) page.
@@ -116,7 +112,7 @@ Note: change the `latest` tag to specific version if needed. Avoid using the lat
 Get COMS image:
 
 ```sh
-docker pull docker.io/bcgovimages/common-object-management-service:latest
+docker pull ghcr.io/bcgov/common-object-management-service:latest
 ```
 
 Run COMS in **Unauthenticated mode** (replace environment values as necessary)
@@ -129,7 +125,7 @@ docker run -it --rm -p 3000:3000 \
   -e OBJECTSTORAGE_ENDPOINT=<Object store URL. eg: https://nrs.objectstore.gov.bc.ca> \
   -e OBJECTSTORAGE_KEY=<base path for storage location> \
   -e OBJECTSTORAGE_SECRETACCESSKEY=<Secret Access Key for your S3 compatible object storage account> \
-  docker.io/bcgovimages/common-object-management-service:latest
+  bcgov/common-object-management-service:latest
 ```
 
 Run COMS in **Basic Auth mode** (replace environment values as necessary)
@@ -146,7 +142,7 @@ docker run -it --rm -p 3000:3000 \
   -e BASICAUTH_USERNAME=<Your chosen Basic Auth Username> \
   -e BASICAUTH_PASSWORD=<Your chosen Basic Auth Password> \
   -e S3ACCESSMODE_ENABLED=true \
-  docker.io/bcgovimages/common-object-management-service:latest
+  bcgov/common-object-management-service:latest
 ```
 
 ---
@@ -155,7 +151,7 @@ Before running the application, you must make sure that your database is up to d
 
 ```sh
 docker run -it --rm --entrypoint '/bin/sh' -c 'npm run migrate' \
-  docker.io/bcgovimages/common-object-management-service:latest
+  bcgov/common-object-management-service:latest
 ```
 
 Run COMS in **OIDC Auth Mode** (replace environment values as necessary)
@@ -176,7 +172,7 @@ docker run -it --rm -p 3000:3000 \
   -e KC_SERVERURL=<url> \
   -e DB_PASSWORD=<password> \
   -e DB_PORT=<your postgres database port> \
-  docker.io/bcgovimages/common-object-management-service:latest
+  bcgov/common-object-management-service:latest
 ```
 
 Run COMS in **Full Auth Mode** (replace environment values as necessary)
@@ -201,7 +197,7 @@ docker run -it --rm -p 3000:3000 \
   -e KC_SERVERURL=<url> \
   -e DB_PASSWORD=<password> \
   -e DB_PORT=<your postgres database port> \
-  docker.io/bcgovimages/common-object-management-service:latest
+  bcgov/common-object-management-service:latest
 ```
 
 ### Local Machine

charts/coms/Chart.yaml

@@ -3,7 +3,7 @@ name: common-object-management-service
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.1.0
+version: 2.1.1
 kubeVersion: ">= 1.13.0"
 description: A microservice for managing access control to S3 Objects
 # A chart can be either an 'application' or a 'library' chart.
@@ -28,7 +28,7 @@ sources:
   - https://github.com/bcgov/common-object-management-service
 dependencies:
   - name: postgrescluster
-    version: 2.1.0
+    version: 2.1.1
     repository: "file://../postgres"
     condition: postgres.enabled
     alias: postgres

charts/coms/README.md

@@ -1,6 +1,6 @@
 # common-object-management-service
 
-![Version: 2.0.3](https://img.shields.io/badge/Version-2.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.9.0](https://img.shields.io/badge/AppVersion-0.9.0-informational?style=flat-square)
+![Version: 2.1.1](https://img.shields.io/badge/Version-2.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.9.0](https://img.shields.io/badge/AppVersion-0.9.0-informational?style=flat-square)
 
 A microservice for managing access control to S3 Objects
 
@@ -22,7 +22,7 @@ Kubernetes: `>= 1.13.0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../postgres | postgres(postgrescluster) | 2.0.2 |
+| file://../postgres | postgres(postgrescluster) | 2.1.1 |
 
 ## Values
 
@@ -45,7 +45,7 @@ Kubernetes: `>= 1.13.0`
 | features.oidcAuth | bool | `false` | Specifies whether oidc auth is enabled |
 | fullnameOverride | string | `nil` | String to fully override fullname |
 | image.pullPolicy | string | `"IfNotPresent"` | Default image pull policy |
-| image.repository | string | `"docker.io/bcgovimages"` | Default image repository |
+| image.repository | string | `"ghcr.io/bcgov"` | Default image repository |
 | image.tag | string | `nil` | Overrides the image tag whose default is the chart appVersion. |
 | imagePullSecrets | list | `[]` | Specify docker-registry secret names as an array |
 | keycloakSecretOverride.password | string | `nil` | Keycloak password |

charts/coms/values.yaml

@@ -6,7 +6,7 @@
 
 image:
   # -- Default image repository
-  repository: docker.io/bcgovimages
+  repository: ghcr.io/bcgov
   # -- Default image pull policy
   pullPolicy: IfNotPresent
   # -- Overrides the image tag whose default is the chart appVersion.