Merge pull request #447 from manala/lazy/jq-yq

[Lazy] Introduce jq/yq
manala · Sep 16, 2024 · 72d5d1b · 72d5d1b
2 parents 82b13b4 + 125d1a0
commit 72d5d1b
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 0 deletions.
diff --git a/lazy.ansible/.manala/docker/Dockerfile.tmpl b/lazy.ansible/.manala/docker/Dockerfile.tmpl
@@ -12,6 +12,8 @@ ARG MANALA_GROUP_ID="1000"
 ARG GOSU_VERSION="1.17"
 ARG GOMPLATE_VERSION="4.1.0"
 ARG DIRENV_VERSION="2.34.0"
+ARG JQ_VERSION="1.7.1"
+ARG YQ_VERSION="4.44.3"
 
 # The 'container' environment variable tells systemd that it's running inside a
 # Docker container environment.
@@ -57,6 +59,14 @@ RUN \
     && curl -sSL "https://github.com/direnv/direnv/releases/download/v${DIRENV_VERSION}/direnv.linux-{{ include "arch_map" (dict "amd64" "amd64" "arm64" "arm64") }}" \
         --output /usr/local/bin/direnv \
     && chmod +x /usr/local/bin/direnv \
+    # Jq
+    && curl -sSL "https://github.com/jqlang/jq/releases/download/jq-${JQ_VERSION}/jq-linux-{{ include "arch_map" (dict "amd64" "amd64" "arm64" "arm64") }}" \
+        --output /usr/local/bin/jq \
+    && chmod +x /usr/local/bin/jq \
+    # Yq
+    && curl -sSL "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_{{ include "arch_map" (dict "amd64" "amd64" "arm64" "arm64") }}" \
+        --output /usr/local/bin/yq \
+    && chmod +x /usr/local/bin/yq \
     # Bash completion
     && install --verbose --mode 0755 --directory /etc/bash_completion.d \
     # Oh My Bash

diff --git a/lazy.ansible/test/goss.yaml b/lazy.ansible/test/goss.yaml
@@ -60,6 +60,16 @@ command:
     exit-status: 0
     stdout:
       - 2.34.0
+  # Jq
+  jq --version:
+    exit-status: 0
+    stdout:
+      - jq-1.7.1
+  # Yq
+  yq --version:
+    exit-status: 0
+    stdout:
+      - yq (https://github.com/mikefarah/yq/) version v4.44.3
   # Goss
   goss --version:
     exit-status: 0

diff --git a/lazy.kubernetes/.manala/docker/Dockerfile.tmpl b/lazy.kubernetes/.manala/docker/Dockerfile.tmpl
@@ -12,6 +12,8 @@ ARG MANALA_GROUP_ID="1000"
 ARG GOSU_VERSION="1.17"
 ARG GOMPLATE_VERSION="4.1.0"
 ARG DIRENV_VERSION="2.34.0"
+ARG JQ_VERSION="1.7.1"
+ARG YQ_VERSION="4.44.3"
 
 # The 'container' environment variable tells systemd that it's running inside a
 # Docker container environment.
@@ -57,6 +59,14 @@ RUN \
     && curl -sSL "https://github.com/direnv/direnv/releases/download/v${DIRENV_VERSION}/direnv.linux-{{ include "arch_map" (dict "amd64" "amd64" "arm64" "arm64") }}" \
         --output /usr/local/bin/direnv \
     && chmod +x /usr/local/bin/direnv \
+    # Jq
+    && curl -sSL "https://github.com/jqlang/jq/releases/download/jq-${JQ_VERSION}/jq-linux-{{ include "arch_map" (dict "amd64" "amd64" "arm64" "arm64") }}" \
+        --output /usr/local/bin/jq \
+    && chmod +x /usr/local/bin/jq \
+    # Yq
+    && curl -sSL "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_{{ include "arch_map" (dict "amd64" "amd64" "arm64" "arm64") }}" \
+        --output /usr/local/bin/yq \
+    && chmod +x /usr/local/bin/yq \
     # Bash completion
     && install --verbose --mode 0755 --directory /etc/bash_completion.d \
     # Oh My Bash

diff --git a/lazy.kubernetes/test/goss.yaml b/lazy.kubernetes/test/goss.yaml
@@ -46,6 +46,16 @@ command:
     exit-status: 0
     stdout:
       - 2.34.0
+  # Jq
+  jq --version:
+    exit-status: 0
+    stdout:
+      - jq-1.7.1
+  # Yq
+  yq --version:
+    exit-status: 0
+    stdout:
+      - yq (https://github.com/mikefarah/yq/) version v4.44.3
   # Goss
   goss --version:
     exit-status: 0

diff --git a/lazy.symfony/.manala/docker/Dockerfile.tmpl b/lazy.symfony/.manala/docker/Dockerfile.tmpl
@@ -12,6 +12,8 @@ ARG MANALA_GROUP_ID="1000"
 ARG GOSU_VERSION="1.17"
 ARG GOMPLATE_VERSION="4.1.0"
 ARG DIRENV_VERSION="2.34.0"
+ARG JQ_VERSION="1.7.1"
+ARG YQ_VERSION="4.44.3"
 
 # The 'container' environment variable tells systemd that it's running inside a
 # Docker container environment.
@@ -57,6 +59,14 @@ RUN \
     && curl -sSL "https://github.com/direnv/direnv/releases/download/v${DIRENV_VERSION}/direnv.linux-{{ include "arch_map" (dict "amd64" "amd64" "arm64" "arm64") }}" \
         --output /usr/local/bin/direnv \
     && chmod +x /usr/local/bin/direnv \
+    # Jq
+    && curl -sSL "https://github.com/jqlang/jq/releases/download/jq-${JQ_VERSION}/jq-linux-{{ include "arch_map" (dict "amd64" "amd64" "arm64" "arm64") }}" \
+        --output /usr/local/bin/jq \
+    && chmod +x /usr/local/bin/jq \
+    # Yq
+    && curl -sSL "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_{{ include "arch_map" (dict "amd64" "amd64" "arm64" "arm64") }}" \
+        --output /usr/local/bin/yq \
+    && chmod +x /usr/local/bin/yq \
     # Bash completion
     && install --verbose --mode 0755 --directory /etc/bash_completion.d \
     # Oh My Bash

diff --git a/lazy.symfony/test/goss.yaml b/lazy.symfony/test/goss.yaml
@@ -54,6 +54,16 @@ command:
     exit-status: 0
     stdout:
       - 2.34.0
+  # Jq
+  jq --version:
+    exit-status: 0
+    stdout:
+      - jq-1.7.1
+  # Yq
+  yq --version:
+    exit-status: 0
+    stdout:
+      - yq (https://github.com/mikefarah/yq/) version v4.44.3
   # Goss
   goss --version:
     exit-status: 0