diff --git a/.github/workflows/test-and-lint.yml b/.github/workflows/test-and-lint.yml index 102f6a4..97e802b 100644 --- a/.github/workflows/test-and-lint.yml +++ b/.github/workflows/test-and-lint.yml @@ -57,11 +57,10 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: "GHCR Build" + - name: GHCR Build id: docker_build uses: docker/build-push-action@v5 with: push: false platforms: linux/amd64,linux/arm64 tags: ghcr.io/lerentis/bitwarden-crd-operator:dev - diff --git a/Dockerfile b/Dockerfile index 672472e..0c59fa9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,37 +4,20 @@ LABEL org.opencontainers.image.source=https://github.com/Lerentis/bitwarden-crd- LABEL org.opencontainers.image.description="Kubernetes Operator to create k8s secrets from bitwarden" LABEL org.opencontainers.image.licenses=MIT -ARG PYTHON_VERSION=3.11.6-r1 +ARG PYTHON_VERSION=3.11.8-r0 ARG PIP_VERSION=23.3.1-r0 ARG GCOMPAT_VERSION=1.1.0-r4 ARG LIBCRYPTO_VERSION=3.1.4-r2 ARG BW_VERSION=2023.7.0 -ARG NODE_VERSION=20.11.0-r0 +ARG NODE_VERSION=20.11.1-r0 COPY requirements.txt /requirements.txt RUN set -eux; \ - apk add --virtual build-dependencies wget unzip; \ - ARCH="$(apk --print-arch)"; \ - case "${ARCH}" in \ - aarch64|arm64) \ - apk del nodejs-current; \ - apk add nodejs=${NODE_VERSION} npm; \ - npm install -g @bitwarden/cli@${BW_VERSION}; \ - ;; \ - amd64|x86_64) \ - cd /tmp; \ - wget https://github.com/bitwarden/clients/releases/download/cli-v${BW_VERSION}/bw-linux-${BW_VERSION}.zip; \ - unzip /tmp/bw-linux-${BW_VERSION}.zip; \ - mv /tmp/bw /usr/local/bin/bw; \ - chmod +x /usr/local/bin/bw; \ - ;; \ - *) \ - echo "Unsupported arch: ${ARCH}"; \ - exit 1; \ - ;; \ - esac; \ - apk del --purge build-dependencies; \ + apk update; \ + apk del nodejs-current; \ + apk add nodejs=${NODE_VERSION} npm; \ + npm install -g @bitwarden/cli@${BW_VERSION}; \ addgroup -S -g 1000 bw-operator; \ adduser -S -D -u 1000 -G bw-operator bw-operator; \ mkdir -p /home/bw-operator; \ diff --git a/charts/bitwarden-crd-operator/Chart.yaml b/charts/bitwarden-crd-operator/Chart.yaml index 56c011f..ecdd652 100644 --- a/charts/bitwarden-crd-operator/Chart.yaml +++ b/charts/bitwarden-crd-operator/Chart.yaml @@ -4,9 +4,9 @@ description: Deploy the Bitwarden CRD Operator type: application -version: "v0.11.2" +version: "v0.11.3" -appVersion: "0.10.2" +appVersion: "0.10.3" keywords: - operator @@ -102,9 +102,11 @@ annotations: artifacthub.io/containsSecurityUpdates: "false" artifacthub.io/changes: | - kind: changed - description: "Update jinja to 3.1.3" + description: "Update python to 3.11.8-r0" - kind: changed - description: "Update Node on arm to 20.11.0-r0" + description: "Update Node to 20.11.1-r0" + - kind: changed + description: "Unified bw cli installation methode" artifacthub.io/images: | - name: bitwarden-crd-operator - image: ghcr.io/lerentis/bitwarden-crd-operator:0.10.2 + image: ghcr.io/lerentis/bitwarden-crd-operator:0.10.3