From 16040bf87a1024da76db4b1d0c44ed6b4ae83863 Mon Sep 17 00:00:00 2001 From: Tobias Trabelsi Date: Sat, 22 Apr 2023 15:15:53 +0200 Subject: [PATCH] Push to more Registries Fixes #14 --- .github/workflows/release.yml | 17 ++++++++++++++++- Dockerfile | 4 ++++ charts/bitwarden-crd-operator/Chart.yaml | 6 +++--- charts/bitwarden-crd-operator/values.yaml | 2 +- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4eecbfe..a26f25d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,10 +39,25 @@ jobs: with: cmd: yq '.appVersion' charts/bitwarden-crd-operator/Chart.yaml + - name: "GHCR Login" + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: "GHCR Build and Push" + id: docker_build + uses: docker/build-push-action@v4 + with: + push: true + platforms: linux/amd64,linux/arm64 + tags: ghcr.io/${{ github.actor }}/bitwarden-crd-operator:${{ steps.app_version.outputs.result }} + - name: Create SBOM uses: anchore/sbom-action@v0 with: - image: lerentis/bitwarden-crd-operator:${{ steps.app_version.outputs.result }} + image: ghcr.io/${{ github.actor }}/bitwarden-crd-operator:${{ steps.app_version.outputs.result }} - name: Publish SBOM uses: anchore/sbom-action/publish-sbom@v0 diff --git a/Dockerfile b/Dockerfile index a0fa181..1d321ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,10 @@ RUN cd /tmp && wget https://github.com/bitwarden/clients/releases/download/cli-v FROM alpine:3.17.3 +LABEL org.opencontainers.image.source=https://github.com/Lerentis/bitwarden-crd-operator +LABEL org.opencontainers.image.description="Kubernetes Operator to create k8s secrets from bitwarden" +LABEL org.opencontainers.image.licenses=MIT + ARG PYTHON_VERSION=3.10.11-r0 ARG PIP_VERSION=22.3.1-r1 ARG GCOMPAT_VERSION=1.1.0-r0 diff --git a/charts/bitwarden-crd-operator/Chart.yaml b/charts/bitwarden-crd-operator/Chart.yaml index 6eecbc1..b5c774f 100644 --- a/charts/bitwarden-crd-operator/Chart.yaml +++ b/charts/bitwarden-crd-operator/Chart.yaml @@ -4,7 +4,7 @@ description: Deploy the Bitwarden CRD Operator type: application -version: "v0.5.4" +version: "v0.6.0" appVersion: "0.5.4" @@ -95,7 +95,7 @@ annotations: artifacthub.io/operator: "true" artifacthub.io/changes: | - kind: changed - description: "Bump Alpine base image from 3.17.2 to 3.17.3" + description: "Default image registry to ghcr.io and no longer docker hub. docker hub images will continue to be published" artifacthub.io/images: | - name: bitwarden-crd-operator - image: lerentis/bitwarden-crd-operator:0.5.4 + image: ghcr.io/lerentis/bitwarden-crd-operator:0.5.4 diff --git a/charts/bitwarden-crd-operator/values.yaml b/charts/bitwarden-crd-operator/values.yaml index 726c9b3..b153a88 100644 --- a/charts/bitwarden-crd-operator/values.yaml +++ b/charts/bitwarden-crd-operator/values.yaml @@ -5,7 +5,7 @@ replicaCount: 1 image: - repository: lerentis/bitwarden-crd-operator + repository: ghcr.io/lerentis/bitwarden-crd-operator pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. # tag: "0.1.0"