Merge branch 'master' into centos8

startxfr · Dec 22, 2021 · 215c55b · 215c55b
2 parents c45bb8d + da2366f
commit 215c55b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/GitlabRunner/ansible/Dockerfile b/GitlabRunner/ansible/Dockerfile
@@ -38,7 +38,7 @@ RUN dnf upgrade -yq --refresh && \
     openssh-clients && \
     alternatives --set python /usr/bin/python3 && \
     echo "alias pip=pip3" >> /etc/bashrc && \
-    pip3 install -q ansible-runner ansible-lint openshift && \
+    pip3 install -q ansible-runner ansible-lint openshift yq && \
     dnf remove -yq --skip-broken yum-utils gcc python3-devel epel-release && \
     dnf config-manager --enable --add-repo https://releases.ansible.com/ansible-runner/ansible-runner.el8.repo && \
     dnf install -yq --nogpgcheck ansible-runner && \

diff --git a/GitlabRunner/apache/Dockerfile b/GitlabRunner/apache/Dockerfile
@@ -29,6 +29,7 @@ RUN dnf upgrade -yq --refresh && \
     bubblewrap \
     rsync \
     openssh-clients && \
+    pip3 install -q yq && \
     dnf remove -yq --skip-broken yum-utils && \
     dnf clean all --enablerepo=\* && \
     useradd -u ${SX_UID} -m ${SX_UNAME} && \

diff --git a/GitlabRunner/bash/Dockerfile b/GitlabRunner/bash/Dockerfile
@@ -34,6 +34,7 @@ RUN dnf upgrade -yq --refresh && \
     gem \
     git \
     bats && \
+    pip3 install -q yq && \
     dnf remove -yq --skip-broken yum-utils && \
     dnf clean all --enablerepo=\* && \
     useradd -s /bin/bash -u ${SX_UID} -g 0 -m ${SX_UNAME} && \

diff --git a/GitlabRunner/nodejs/Dockerfile b/GitlabRunner/nodejs/Dockerfile
@@ -32,6 +32,7 @@ RUN dnf upgrade -yq --refresh && \
     rsync \
     openssh-clients \
     sshpass && \
+    pip3 install -q yq && \
     dnf remove -yq --skip-broken yum-utils && \
     dnf clean all --enablerepo=\* && \
     useradd -u ${SX_UID} -m ${SX_UNAME} && \

diff --git a/GitlabRunner/php/Dockerfile b/GitlabRunner/php/Dockerfile
@@ -29,6 +29,7 @@ RUN dnf upgrade -yq --refresh && \
     rsync \
     openssh-clients \
     sshpass && \
+    pip3 install -q yq && \
     dnf remove -yq --skip-broken yum-utils && \
     dnf clean all --enablerepo=\* && \
     useradd -u ${SX_UID} -m ${SX_UNAME} && \