feat: add yq executable to both builders

Add to both for consistency. Signed-off-by: Artem Chernyshev <artem.chernyshev@talos-systems.com>
siderolabs · Dec 26, 2023 · 0a6d241 · 0a6d241
1 parent 95301d5
commit 0a6d241
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -49,6 +49,7 @@ RUN apk add --update --no-cache \
   socat \
   swtpm \
   tar \
+  yq \
   xz
 
 # Install gcloud

diff --git a/Dockerfile.actions-runner-ubuntu-22.04 b/Dockerfile.actions-runner-ubuntu-22.04
@@ -1,6 +1,8 @@
 FROM summerwind/actions-runner-dind:ubuntu-22.04
 # renovate: datasource=github-releases depName=google/go-containerregistry
 ARG CRANE_VERSION=v0.16.1
+# renovate: datasource=github-releases depName=mikefarah/yq
+ARG YQ_VERSION=v4.40.5
 USER root
 RUN apt update && \
 	apt upgrade -y && \
@@ -19,5 +21,8 @@ RUN apt update && \
 	docker.io \
 	diffoscope \
 	gh
+
+RUN curl -SL https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 -o /usr/bin/yq && chmod +x /usr/bin/yq
 RUN curl -SL https://github.com/google/go-containerregistry/releases/download/${CRANE_VERSION}/go-containerregistry_Linux_x86_64.tar.gz | tar xzf - -C /usr/local/bin/ crane
 USER runner
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,6 +49,7 @@ RUN apk add --update --no-cache \ @@
       socat \
       swtpm \
       tar \
+      yq \
       xz
     # Install gcloud
@@ Expand Down @@