From afc3dcd61204010cdf1e2058ea10b4ede45b2734 Mon Sep 17 00:00:00 2001 From: James Jones Date: Fri, 6 Sep 2024 23:11:16 +0000 Subject: [PATCH 1/2] Cleaning up with the Fedora 40 base image --- Dockerfile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index f213952..c6194c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 From 57c749271feee95d64040f6570215bd05540e6f4 Mon Sep 17 00:00:00 2001 From: James Jones Date: Sat, 16 Nov 2024 22:24:12 +0000 Subject: [PATCH 2/2] Fedora 41 Podman Update --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c6194c6..9425bec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN echo ipv4 >> ~/.curlrc && \ RUN dnf install -y --nogpgcheck \ https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \ https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm && \ - dnf groupupdate core -y + dnf config-manager setopt fedora-cisco-openh264.enabled=1 -y # Adding on the docker alias, docker-compose and other useful stuff including the Azure CLI and RPM build tools along with FPM # docker-compose - broken dependencies in F38 so removing