Merge branch 'develop' into 'main'
Some checks failed
Build podman-dind-like / build-and-push (GITHUB_TOKEN, HOME_NEXUS_DOCKER_PASSWORD, NEXUS_DOCKER_USER, ghcr.io, $NEXUS_PROXY_REGISTRY, GITHUB_DOCKER_USER) (push) Has been cancelled
Build podman-dind-like / build-and-push (HOME_NEXUS_DOCKER_PASSWORD, HOME_NEXUS_DOCKER_PASSWORD, NEXUS_DOCKER_USER, nexus.jamesjonesconsulting.com:5443, $NEXUS_PROXY_REGISTRY, NEXUS_DOCKER_USER) (push) Has been cancelled

Cleaning up with the Fedora 40 base image

See merge request ymdllc/containers/podman-dind-like!23
This commit is contained in:
James Jones
2024-09-06 23:11:16 +00:00

View File

@@ -16,7 +16,7 @@ RUN dnf install -y --nogpgcheck \
# docker-compose - broken dependencies in F38 so removing
RUN dnf install -y podman-docker buildah skopeo \
util-linux ansible-core openssh-clients krb5-devel krb5-libs krb5-workstation git jq wget curl unzip coreutils \
samba-client samba-common cifs-utils helm doctl gnupg2 pinentry expect gh awscli \
samba-client samba-common cifs-utils helm doctl gnupg2 pinentry expect gh awscli glab yq \
python3-jsonpatch python3-requests-oauthlib python3-kubernetes python3-pyyaml python3-pip \
&& curl -k -s -o - \
https://nexus.jamesjonesconsulting.com/repository/package-config/dist/proxy/rpmfusion/rpmfusion-setup-proxy-repos.sh |\
@@ -32,20 +32,14 @@ RUN dnf install -y podman-docker buildah skopeo \
&& dnf install -y cpanminus perl-Mojolicious perl-Test-Mojo perl-Test-Harness perl-Perl-Critic perl-Carton \
&& curl -k -s -o /etc/yum.repos.d/okd.repo https://nexus.jamesjonesconsulting.com/repository/package-config/yum/okd.repo \
&& dnf install -y okd-client \
&& curl -k -s -o /etc/yum.repos.d/okd.repo https://nexus.jamesjonesconsulting.com/repository/package-config/yum/sonarqube-packages.repo \
&& dnf install -y sonar-scanner-cli-${SONAR_SCANNER_VERSION} \
&& dnf clean all \
&& rm -rf /var/cache/yum \
&& wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq \
&& chmod +x /usr/bin/yq \
&& curl --silent --location "https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp \
&& mv /tmp/eksctl /usr/bin \
&& touch /etc/containers/nodocker
RUN curl -L -o sonar-scanner.zip \
"https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-linux.zip" && \
unzip sonar-scanner.zip -d /opt && \
rm -f sonar-scanner.zip && \
mv /opt/sonar-scanner* "$SONAR_SCANNER_HOME"
ENV PATH=$SONAR_SCANNER_HOME/bin:$PATH
# Adding some Ansible Key and Timeout setting as well as accepting ssh-rsa