Merge branch 'master' into centos8

startxfr · Dec 22, 2021 · 3b44efd · 3b44efd
2 parents 215c55b + 51b22d8
commit 3b44efd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/GitlabRunner/ansible/Dockerfile b/GitlabRunner/ansible/Dockerfile
@@ -35,7 +35,8 @@ RUN dnf upgrade -yq --refresh && \
     gcc python3-devel \
     curl \
     npm nodejs \
-    openssh-clients && \
+    openssh-clients \
+    jq && \
     alternatives --set python /usr/bin/python3 && \
     echo "alias pip=pip3" >> /etc/bashrc && \
     pip3 install -q ansible-runner ansible-lint openshift yq && \

diff --git a/GitlabRunner/apache/Dockerfile b/GitlabRunner/apache/Dockerfile
@@ -28,7 +28,8 @@ RUN dnf upgrade -yq --refresh && \
     make \
     bubblewrap \
     rsync \
-    openssh-clients && \
+    openssh-clients \
+    jq && \
     pip3 install -q yq && \
     dnf remove -yq --skip-broken yum-utils && \
     dnf clean all --enablerepo=\* && \

diff --git a/GitlabRunner/bash/Dockerfile b/GitlabRunner/bash/Dockerfile
@@ -33,7 +33,8 @@ RUN dnf upgrade -yq --refresh && \
     yamllint \
     gem \
     git \
-    bats && \
+    bats \
+    jq && \
     pip3 install -q yq && \
     dnf remove -yq --skip-broken yum-utils && \
     dnf clean all --enablerepo=\* && \

diff --git a/GitlabRunner/nodejs/Dockerfile b/GitlabRunner/nodejs/Dockerfile
@@ -31,7 +31,8 @@ RUN dnf upgrade -yq --refresh && \
     bubblewrap \
     rsync \
     openssh-clients \
-    sshpass && \
+    sshpass \
+    jq && \
     pip3 install -q yq && \
     dnf remove -yq --skip-broken yum-utils && \
     dnf clean all --enablerepo=\* && \