fix: tf-runner

apps/tf-runner-bitwarden/Dockerfile

@@ -1,8 +1,7 @@
-ARG VERSION
+# renovate: datasource=github-releases depName=weaveworks/tf-runner versioning=docker
+ARG VERSION=0.15.1
 
-FROM node:21.6-bookworm as build
-# renovate: datasource=npm depName=@bitwarden/cli versioning=npm
-ARG BW_VERSION=2024.1.0
+FROM ghcr.io/weaveworks/tf-runner:v${VERSION} as runner
 
 ARG TARGETPLATFORM
 ARG TARGETARCH
@@ -11,19 +10,13 @@ ARG TARGETOS
 LABEL dev.LilDrunkenSmurf.image.target_platform=$TARGETPLATFORM
 LABEL dev.LilDrunkenSmurf.image.target_architecture=$TARGETARCH
 LABEL dev.LilDrunkenSmurf.image.target_os=$TARGETOS
-LABEL org.opencontainers.image.source="https://github.com/bitwarden/clients"
 LABEL org.opencontainers.image.source="https://github.com/weaveworks/tf-controller"
 
-WORKDIR /usr/local/bin
-
-RUN npm i -g @bitwarden/cli@${BW_VERSION}
-
-# renovate: datasource=github-releases depName=weaveworks/tf-runner versioning=docker
-
-FROM ghcr.io/weaveworks/tf-runner:v${VERSION} as runner
+# renovate: datasource=npm depName=@bitwarden/cli versioning=npm
+ARG BW_VERSION=2024.1.0
 
 USER root
 
-COPY --from=build /usr/local/bin/bw /usr/local/bin/bw
+RUN apk add --no-cache npm && npm i -g @bitwarden/cli@${BW_CLI_VERSION}
 
 USER 65532:65532

apps/tf-runner-bitwarden/Dockerfile.old

@@ -0,0 +1,29 @@
+ARG VERSION
+
+FROM node:21.6-bookworm as build
+# renovate: datasource=npm depName=@bitwarden/cli versioning=npm
+ARG BW_VERSION=2024.1.0
+
+ARG TARGETPLATFORM
+ARG TARGETARCH
+ARG TARGETOS
+
+LABEL dev.LilDrunkenSmurf.image.target_platform=$TARGETPLATFORM
+LABEL dev.LilDrunkenSmurf.image.target_architecture=$TARGETARCH
+LABEL dev.LilDrunkenSmurf.image.target_os=$TARGETOS
+LABEL org.opencontainers.image.source="https://github.com/bitwarden/clients"
+LABEL org.opencontainers.image.source="https://github.com/weaveworks/tf-controller"
+
+WORKDIR /usr/local/bin
+
+RUN npm i -g @bitwarden/cli@${BW_VERSION}
+
+# renovate: datasource=github-releases depName=weaveworks/tf-runner versioning=docker
+
+FROM ghcr.io/weaveworks/tf-runner:v${VERSION} as runner
+
+USER root
+
+COPY --from=build /usr/local/bin/bw /usr/local/bin/bw
+
+USER 65532:65532

apps/tf-runner-bitwarden/metadata.yaml

@@ -4,7 +4,7 @@ base: false
 semantic_versioning: false
 channels:
   - name: stable
-    platforms: ["linux/amd64", "linux/arm64"] # ["linux/amd64", "linux/arm64"] arm64 is failing right now
+    platforms: ["linux/amd64"] # ["linux/amd64", "linux/arm64"] arm64 is failing right now
     stable: true
     tests:
       enabled: false