Update Dockerfile yq

adeepn-arc · Aug 16, 2023 · cbef4b5 · cbef4b5
1 parent f08e86b
commit cbef4b5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/runner/actions-runner-dind-rootless.ubuntu-22.04.dockerfile b/runner/actions-runner-dind-rootless.ubuntu-22.04.dockerfile
@@ -8,6 +8,7 @@ ENV CHANNEL=stable
 ARG DOCKER_COMPOSE_VERSION=v2.20.0
 ARG DUMB_INIT_VERSION=1.2.5
 ARG RUNNER_USER_UID=1001
+ARG YQ_VERSION=v4.33.3
 
 # Other arguments
 ARG DEBUG=false
@@ -123,9 +124,11 @@ RUN if [ "${BUILD_ARCH}" = "armhf" ] || [ "${BUILD_ARCH}" = "armv7" ]; then \
         wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_arm64"; \
     elif [ "${BUILD_ARCH}" = "i386" ]; then \
         wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_386"; \
-    else [ "${BUILD_ARCH}" = "amd64" ]; then \
+    else \
         wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64"; \
-    fi
+    fi \
+    && chmod +x /usr/bin/yq
+
 
 # Runner user
 RUN adduser --disabled-password --gecos "" --uid $RUNNER_USER_UID runner

diff --git a/runner/actions-runner-dind.ubuntu-22.04.dockerfile b/runner/actions-runner-dind.ubuntu-22.04.dockerfile
@@ -10,6 +10,7 @@ ARG DOCKER_COMPOSE_VERSION=v2.20.0
 ARG DUMB_INIT_VERSION=1.2.5
 ARG RUNNER_USER_UID=1001
 ARG DOCKER_GROUP_GID=121
+ARG YQ_VERSION=v4.33.3
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -y \
@@ -119,9 +120,11 @@ RUN if [ "${BUILD_ARCH}" = "armhf" ] || [ "${BUILD_ARCH}" = "armv7" ]; then \
         wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_arm64"; \
     elif [ "${BUILD_ARCH}" = "i386" ]; then \
         wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_386"; \
-    else [ "${BUILD_ARCH}" = "amd64" ]; then \
+    else \
         wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64"; \
-    fi
+    fi \
+    && chmod +x /usr/bin/yq
+
 
 # Runner user
 RUN adduser --disabled-password --gecos "" --uid $RUNNER_USER_UID runner \

diff --git a/runner/actions-runner.ubuntu-22.04.dockerfile b/runner/actions-runner.ubuntu-22.04.dockerfile
@@ -10,6 +10,7 @@ ARG DOCKER_COMPOSE_VERSION=v2.20.0
 ARG DUMB_INIT_VERSION=1.2.5
 ARG RUNNER_USER_UID=1001
 ARG DOCKER_GROUP_GID=121
+ARG YQ_VERSION=v4.33.3
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -y \
@@ -117,9 +118,10 @@ RUN if [ "${BUILD_ARCH}" = "armhf" ] || [ "${BUILD_ARCH}" = "armv7" ]; then \
         wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_arm64"; \
     elif [ "${BUILD_ARCH}" = "i386" ]; then \
         wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_386"; \
-    else [ "${BUILD_ARCH}" = "amd64" ]; then \
+    else \
         wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64"; \
-    fi
+    fi \
+    && chmod +x /usr/bin/yq
 
 RUN adduser --disabled-password --gecos "" --uid $RUNNER_USER_UID runner \
     && groupadd docker --gid $DOCKER_GROUP_GID \