From 9aac923ba349faf25ad988cf152041f9ae19bb14 Mon Sep 17 00:00:00 2001 From: James Jones Date: Sat, 4 May 2024 12:44:20 +0000 Subject: [PATCH 1/3] Upgrading base container to Fedora 40 and adding the OKD client --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 5141e04..907a13f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,6 +27,8 @@ RUN dnf install -y podman-docker buildah skopeo \ && dnf install -y rpm-build rpm-sign rubygems ruby-devel gcc gcc-c++ make libffi-devel \ && dnf install -y ansible-collection* \ && 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 \ && dnf clean all \ && rm -rf /var/cache/yum \ && wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq \ From 2fa74f1fe93c4cfe613f9ffdcbb51829d3978bd6 Mon Sep 17 00:00:00 2001 From: James Jones Date: Sat, 4 May 2024 13:41:21 +0000 Subject: [PATCH 2/3] Moving the updated pip.conf into /etc and setting an env var so Python knows where to find it. This will allow all users to use the proxy rather than the user running in the container. --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 907a13f..dbcfcf0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -64,7 +64,12 @@ RUN gem install ffi \ # Setting up Pypi to use proxy RUN curl -k -s -o - \ https://nexus.jamesjonesconsulting.com/repository/package-config/pypi/python3-pypi-repos.sh |\ - bash + bash \ + && mv ~/.config/pip/pip.conf /etc/pip.conf \ + && chmod 644 /etc/pip.conf \ + && rm -Rf ~/.config/pip + +ENV PIP_CONFIG_FILE=/etc/pip.conf # Adding on the CPAN mirror settings for Carton and cpanminus ENV PERL_CPANM_OPT="--mirror https://nexus.jamesjonesconsulting.com/repository/cpan-proxy/" \ From 34f3a8dd1b45b0d306f925f6a67970b793df024b Mon Sep 17 00:00:00 2001 From: James Jones Date: Mon, 27 May 2024 23:34:10 +0000 Subject: [PATCH 3/3] Adding python3-kubernetes package and removing kubectl binary replaced by okd-client package --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index dbcfcf0..9176f57 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,8 +13,8 @@ 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 \ - helm doctl kubernetes-client gnupg2 pinentry expect gh awscli \ - python3-jsonpatch python3-requests-oauthlib python3-kubernetes python3-pip \ + helm doctl gnupg2 pinentry expect gh awscli \ + 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 |\ bash \