ditch different installation methodes for cpu arch

This commit is contained in:
Tobias Trabelsi 2024-02-19 22:43:30 +01:00
parent b2c7cc5c36
commit e58b390c43
Signed by: lerentis
GPG Key ID: FF0C2839718CAF2E
2 changed files with 8 additions and 23 deletions

View File

@ -65,3 +65,5 @@ jobs:
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
tags: ghcr.io/lerentis/bitwarden-crd-operator:dev tags: ghcr.io/lerentis/bitwarden-crd-operator:dev
- name: test simple run
run: docker run -it --rm --entrypoint=/bin/sh ghcr.io/lerentis/bitwarden-crd-operator:dev -c bw --version

View File

@ -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.description="Kubernetes Operator to create k8s secrets from bitwarden"
LABEL org.opencontainers.image.licenses=MIT 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 PIP_VERSION=23.3.1-r0
ARG GCOMPAT_VERSION=1.1.0-r4 ARG GCOMPAT_VERSION=1.1.0-r4
ARG LIBCRYPTO_VERSION=3.1.4-r2 ARG LIBCRYPTO_VERSION=3.1.4-r2
ARG BW_VERSION=2023.7.0 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 COPY requirements.txt /requirements.txt
RUN set -eux; \ RUN set -eux; \
apk add --virtual build-dependencies wget unzip; \ apk update; \
ARCH="$(apk --print-arch)"; \
case "${ARCH}" in \
aarch64|arm64) \
apk del nodejs-current; \ apk del nodejs-current; \
apk add nodejs=${NODE_VERSION} npm; \ apk add nodejs=${NODE_VERSION} npm; \
npm install -g @bitwarden/cli@${BW_VERSION}; \ 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; \
addgroup -S -g 1000 bw-operator; \ addgroup -S -g 1000 bw-operator; \
adduser -S -D -u 1000 -G bw-operator bw-operator; \ adduser -S -D -u 1000 -G bw-operator bw-operator; \
mkdir -p /home/bw-operator; \ mkdir -p /home/bw-operator; \