Merge branch 'main' into develop

This commit is contained in:
James Jones
2023-02-25 07:55:42 -05:00

View File

@@ -3,7 +3,7 @@ FROM ${ARTIFACTORY}/podman/stable:latest
# Adding on the docker alias, docker-compose and other useful stuff # Adding on the docker alias, docker-compose and other useful stuff
RUN dnf install -y podman-docker buildah skopeo docker-compose \ RUN dnf install -y podman-docker buildah skopeo docker-compose \
util-linux ansible-core openssh-clients krb5-devel krb5-libs krb5-workstation git jq unzip coreutils \ util-linux ansible-core openssh-clients krb5-devel krb5-libs krb5-workstation git jq wget curl unzip coreutils \
helm doctl kubernetes-client gnupg2 pinentry expect gh awscli helm doctl kubernetes-client gnupg2 pinentry expect gh awscli
# Adding the Azure CLI # Adding the Azure CLI
@@ -26,5 +26,9 @@ COPY rpm-sign-expect /usr/bin
RUN chmod +x /usr/bin/rpm-sign-expect RUN chmod +x /usr/bin/rpm-sign-expect
# Get the latest version of the unpackage yq utility
RUN wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq \
&& chmod +x /usr/bin/yq
# Remove the Emulate Docker CLI using podman messages # Remove the Emulate Docker CLI using podman messages
RUN touch /etc/containers/nodocker RUN touch /etc/containers/nodocker