ditch different installation methodes for cpu arch
This commit is contained in:
		
							
								
								
									
										2
									
								
								.github/workflows/test-and-lint.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/test-and-lint.yml
									
									
									
									
										vendored
									
									
								
							| @@ -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 | ||||||
|   | |||||||
							
								
								
									
										29
									
								
								Dockerfile
									
									
									
									
									
								
							
							
						
						
									
										29
									
								
								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.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)"; \ |     apk del nodejs-current; \ | ||||||
|     case "${ARCH}" in \ |     apk add nodejs=${NODE_VERSION} npm; \ | ||||||
|        aarch64|arm64) \ |     npm install -g @bitwarden/cli@${BW_VERSION}; \ | ||||||
|           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; \ |  | ||||||
|     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; \ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user