From 48754d457820b4fc4bb2e5b207974d8a90699341 Mon Sep 17 00:00:00 2001 From: Tobias Trabelsi Date: Sun, 7 Jan 2024 21:20:56 +0100 Subject: [PATCH] fixup for arm --- Dockerfile | 5 +++-- charts/bitwarden-crd-operator/Chart.yaml | 20 ++++++-------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index baefa68..471edc4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,8 @@ ARG PYTHON_VERSION=3.11.6-r1 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.1.0 +ARG BW_VERSION=2023.7.0 +ARG NODE_VERSION=20.10.0-r1 COPY requirements.txt /requirements.txt @@ -17,7 +18,7 @@ RUN set -eux; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ aarch64|arm64) \ - apk add npm; \ + apk add nodejs=${NODE_VERSION} npm; \ npm install -g @bitwarden/cli@${BW_VERSION}; \ ;; \ amd64|x86_64) \ diff --git a/charts/bitwarden-crd-operator/Chart.yaml b/charts/bitwarden-crd-operator/Chart.yaml index 9b0e50e..e841dde 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.0" +version: "v0.11.1" -appVersion: "0.10.0" +appVersion: "0.10.1" keywords: - operator @@ -101,18 +101,10 @@ annotations: artifacthub.io/operator: "true" artifacthub.io/containsSecurityUpdates: "false" artifacthub.io/changes: | + - kind: fixed + description: "Downgrade node to LTS in order to make bw cli work on arm" - kind: changed - description: "Added the possibility to add labels to generated secrets" - - kind: changed - description: "Updated Alpine to 3.19.0" - - kind: changed - description: "Update Python to 3.11.6-r1" - - kind: changed - description: "Update pip to 23.3.1-r0" - - kind: changed - description: "Update gcompat to 1.1.0-r4" - - kind: changed - description: "Update libcrypto3 to 3.1.4-r2" + description: "Update bw cli to 2023.7.0 for the same reason" artifacthub.io/images: | - name: bitwarden-crd-operator - image: ghcr.io/lerentis/bitwarden-crd-operator:0.10.0 + image: ghcr.io/lerentis/bitwarden-crd-operator:0.10.1