From 37cfed88de007231f03d14c798fc1dc0914bb641 Mon Sep 17 00:00:00 2001 From: James Jones Date: Fri, 23 Jun 2023 16:26:51 -0400 Subject: [PATCH 01/38] Testing conditional of matrix --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4940f88..a296ad2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,9 @@ stages: REGISTRY_PASSWORD: $HOME_NEXUS_DOCKER_PASSWORD REGISTRY: $HOME_NEXUS_DOCKER_REGISTRY REGISTRY_IMAGE: $HOME_NEXUS_DOCKER_REGISTRY/$CI_PROJECT_PATH + rules: + - if: '($CI_PROJECT_URL =~ /gitlab.jamesjonesconsulting.com/) && ($REGISTRY != "$HOME_NEXUS_DOCKER_REGISTRY")' + when: never .shared_resources: script: &build_push From 9bce108db6a388929778a2f7ad58bf8a6452d1d2 Mon Sep 17 00:00:00 2001 From: James Jones Date: Fri, 23 Jun 2023 16:28:26 -0400 Subject: [PATCH 02/38] Testing conditional of matrix --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a296ad2..38f69c2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ stages: REGISTRY: $HOME_NEXUS_DOCKER_REGISTRY REGISTRY_IMAGE: $HOME_NEXUS_DOCKER_REGISTRY/$CI_PROJECT_PATH rules: - - if: '($CI_PROJECT_URL =~ /gitlab.jamesjonesconsulting.com/) && ($REGISTRY != "$HOME_NEXUS_DOCKER_REGISTRY")' + - if: '($CI_PROJECT_URL =~ /*.gitlab\.jamesjonesconsulting\.com.*/) && ($REGISTRY != "$HOME_NEXUS_DOCKER_REGISTRY")' when: never .shared_resources: From f449ff4ae4e113f60d73efaeb83cefc4b11012d1 Mon Sep 17 00:00:00 2001 From: James Jones Date: Fri, 23 Jun 2023 16:49:21 -0400 Subject: [PATCH 03/38] Testing conditional of matrix --- .gitlab-ci.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 38f69c2..8941ac6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,9 +17,6 @@ stages: REGISTRY_PASSWORD: $HOME_NEXUS_DOCKER_PASSWORD REGISTRY: $HOME_NEXUS_DOCKER_REGISTRY REGISTRY_IMAGE: $HOME_NEXUS_DOCKER_REGISTRY/$CI_PROJECT_PATH - rules: - - if: '($CI_PROJECT_URL =~ /*.gitlab\.jamesjonesconsulting\.com.*/) && ($REGISTRY != "$HOME_NEXUS_DOCKER_REGISTRY")' - when: never .shared_resources: script: &build_push @@ -42,10 +39,13 @@ build:prereleases: - export IMAGE_TAG=$(echo -en $CI_COMMIT_REF_NAME | sed 's|/|-|g') - *build_push only: - - branches + refs: + - branches + variables: + - '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/) && ($REGISTRY != "$HOME_NEXUS_DOCKER_REGISTRY")' except: - - main - + refs: + - main build:releases: extends: .base stage: dind-build @@ -59,5 +59,8 @@ build:releases: - docker tag "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" "$REGISTRY_IMAGE_LOWER:latest" - docker push "$REGISTRY_IMAGE_LOWER:latest" only: - - tags + refs: + - tags + variables: + - '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/) && ($REGISTRY != "$HOME_NEXUS_DOCKER_REGISTRY")' From f1fdf67ab59f468ecbec4b47802dd03bea6ec734 Mon Sep 17 00:00:00 2001 From: James Jones Date: Fri, 23 Jun 2023 17:05:35 -0400 Subject: [PATCH 04/38] Testing conditional of matrix --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8941ac6..9d397f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,8 @@ build:prereleases: stage: dind-build extends: .base tags: - - big-build + - build + - medium before_script: - *before_auth script: @@ -50,7 +51,8 @@ build:releases: extends: .base stage: dind-build tags: - - big-build + - build + - medium before_script: - *before_auth script: From 7b6c2414465d30f2766f9c047c393af978a4527d Mon Sep 17 00:00:00 2001 From: James Jones Date: Fri, 23 Jun 2023 17:20:59 -0400 Subject: [PATCH 05/38] Testing conditional of matrix --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d397f1..73ca3dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ stages: # See https://gitlab.com/gitlab-org/cluster-integration/cluster-applications/ variables: DOCKER_AUTH_CONFIG: ${HOME_NEXUS_DOCKER_AUTH_CONFIG} - image: "$HOME_NEXUS_DOCKER_REGISTRY_SHARED/podman/stable:latest" + image: "$HOME_NEXUS_DOCKER_REGISTRY_PROXY/podman/stable:latest" timeout: 3h 30m parallel: matrix: @@ -22,11 +22,11 @@ stages: script: &build_push - docker login -u "$REGISTRY_USER" -p "$REGISTRY_PASSWORD" $REGISTRY - export REGISTRY_IMAGE_LOWER=$(echo "$REGISTRY_IMAGE" | tr '[:upper:]' '[:lower:]') - - docker build --pull -t "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" --build-arg ARTIFACTORY=$HOME_NEXUS_DOCKER_REGISTRY_SHARED . + - docker build --pull -t "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" --build-arg ARTIFACTORY=$HOME_NEXUS_DOCKER_REGISTRY_PROXY . - docker push "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" before_script: &before_auth - dnf install -y podman-docker - - docker login -u "$HOME_NEXUS_DOCKER_USER" -p "$HOME_NEXUS_DOCKER_PASSWORD" $HOME_NEXUS_DOCKER_REGISTRY_SHARED + - docker login -u "$HOME_NEXUS_DOCKER_USER" -p "$HOME_NEXUS_DOCKER_PASSWORD" $HOME_NEXUS_DOCKER_REGISTRY_PROXY build:prereleases: stage: dind-build From 40eecbb2f7591e27a1c98a907a23f9af981adb6b Mon Sep 17 00:00:00 2001 From: James Jones Date: Fri, 23 Jun 2023 17:43:25 -0400 Subject: [PATCH 06/38] Testing conditional of matrix --- .gitlab-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73ca3dc..dcea0c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,8 +42,6 @@ build:prereleases: only: refs: - branches - variables: - - '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/) && ($REGISTRY != "$HOME_NEXUS_DOCKER_REGISTRY")' except: refs: - main @@ -63,6 +61,4 @@ build:releases: only: refs: - tags - variables: - - '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/) && ($REGISTRY != "$HOME_NEXUS_DOCKER_REGISTRY")' From 59658c9ffcbd4b6b56bdbd92ad185cd50ef2e46f Mon Sep 17 00:00:00 2001 From: James Jones Date: Fri, 23 Jun 2023 17:52:42 -0400 Subject: [PATCH 07/38] Testing conditional of matrix --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dcea0c5..199d99d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,6 +42,8 @@ build:prereleases: only: refs: - branches + variables: + - '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/ && $REGISTRY_USER == "$HOME_NEXUS_DOCKER_USER") || CI_PROJECT_URL !~ /gitlab\.jamesjonesconsulting\.com/' except: refs: - main @@ -61,4 +63,6 @@ build:releases: only: refs: - tags + variables: + - '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/ && $REGISTRY_USER == "$HOME_NEXUS_DOCKER_USER") || CI_PROJECT_URL !~ /gitlab\.jamesjonesconsulting\.com/' From 42d7f61ea892b2240b2f03ff1cf4d7292c4d653f Mon Sep 17 00:00:00 2001 From: James Jones Date: Fri, 23 Jun 2023 17:53:44 -0400 Subject: [PATCH 08/38] Testing conditional of matrix --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 199d99d..9edce61 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ build:prereleases: refs: - branches variables: - - '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/ && $REGISTRY_USER == "$HOME_NEXUS_DOCKER_USER") || CI_PROJECT_URL !~ /gitlab\.jamesjonesconsulting\.com/' + - '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/ && $REGISTRY_USER == "$HOME_NEXUS_DOCKER_USER") || CI_PROJECT_URL !=~ /gitlab\.jamesjonesconsulting\.com/' except: refs: - main From cc62a67ddb52d80161e3da3bec41e0842d73c75b Mon Sep 17 00:00:00 2001 From: James Jones Date: Fri, 23 Jun 2023 17:54:07 -0400 Subject: [PATCH 09/38] Testing conditional of matrix --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9edce61..22b1860 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,5 +64,5 @@ build:releases: refs: - tags variables: - - '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/ && $REGISTRY_USER == "$HOME_NEXUS_DOCKER_USER") || CI_PROJECT_URL !~ /gitlab\.jamesjonesconsulting\.com/' + - '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/ && $REGISTRY_USER == "$HOME_NEXUS_DOCKER_USER") || CI_PROJECT_URL !=~ /gitlab\.jamesjonesconsulting\.com/' From 068a1a1183630b2e999717f5e11da5cd644c72aa Mon Sep 17 00:00:00 2001 From: James Jones Date: Fri, 23 Jun 2023 17:57:56 -0400 Subject: [PATCH 10/38] Testing conditional of matrix --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22b1860..199d99d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ build:prereleases: refs: - branches variables: - - '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/ && $REGISTRY_USER == "$HOME_NEXUS_DOCKER_USER") || CI_PROJECT_URL !=~ /gitlab\.jamesjonesconsulting\.com/' + - '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/ && $REGISTRY_USER == "$HOME_NEXUS_DOCKER_USER") || CI_PROJECT_URL !~ /gitlab\.jamesjonesconsulting\.com/' except: refs: - main @@ -64,5 +64,5 @@ build:releases: refs: - tags variables: - - '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/ && $REGISTRY_USER == "$HOME_NEXUS_DOCKER_USER") || CI_PROJECT_URL !=~ /gitlab\.jamesjonesconsulting\.com/' + - '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/ && $REGISTRY_USER == "$HOME_NEXUS_DOCKER_USER") || CI_PROJECT_URL !~ /gitlab\.jamesjonesconsulting\.com/' From 78b52d50334f87cc0dfff0969526ea363f89c372 Mon Sep 17 00:00:00 2001 From: James Jones Date: Fri, 23 Jun 2023 18:22:19 -0400 Subject: [PATCH 11/38] Testing conditional of matrix --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 199d99d..ad49674 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ build:prereleases: refs: - branches variables: - - '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/ && $REGISTRY_USER == "$HOME_NEXUS_DOCKER_USER") || CI_PROJECT_URL !~ /gitlab\.jamesjonesconsulting\.com/' + - '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/ && $REGISTRY_USER == "$HOME_NEXUS_DOCKER_USER") || $CI_PROJECT_URL !~ /gitlab\.jamesjonesconsulting\.com/' except: refs: - main @@ -64,5 +64,5 @@ build:releases: refs: - tags variables: - - '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/ && $REGISTRY_USER == "$HOME_NEXUS_DOCKER_USER") || CI_PROJECT_URL !~ /gitlab\.jamesjonesconsulting\.com/' + - '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/ && $REGISTRY_USER == "$HOME_NEXUS_DOCKER_USER") || $CI_PROJECT_URL !~ /gitlab\.jamesjonesconsulting\.com/' From a33de15eb46fc7561a8b237d33a1b5803c8ffa47 Mon Sep 17 00:00:00 2001 From: James Jones Date: Sun, 1 Oct 2023 08:46:40 -0400 Subject: [PATCH 12/38] Adding in all the available ansible galaxy packages --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 976d152..deb6686 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,7 @@ RUN dnf install -y podman-docker buildah skopeo \ && dnf install -y https://packages.microsoft.com/config/rhel/9.0/packages-microsoft-prod.rpm \ && dnf install -y azure-cli \ && dnf install -y rpm-build rpm-sign rubygems ruby-devel gcc gcc-c++ make libffi-devel \ + && dnf install -y ansible-collection* \ && 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 aff76cd99170f19345ee2e7fb4c30e36c67af010 Mon Sep 17 00:00:00 2001 From: James Jones Date: Sun, 1 Oct 2023 09:09:22 -0400 Subject: [PATCH 13/38] Adding proxy for rubygems --- Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index deb6686..630c2ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN dnf install -y podman-docker buildah skopeo \ && 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 \ - && sudo mv /tmp/eksctl /usr/bin \ + && mv /tmp/eksctl /usr/bin \ && touch /etc/containers/nodocker # Adding some Ansible Key and Timeout setting as well as accepting ssh-rsa @@ -29,6 +29,9 @@ RUN chown root:root /etc/ssh/ssh_config.d/99-ansible.conf && chmod 644 /etc/ssh/ # Ensuring the fpm tool is installed to build distro packages such as RPM and DEB COPY rpm-sign-expect /usr/bin -RUN gem install ffi \ +RUN gem sources --add https://nexus.jamesjonesconsulting.com/repository/rubygems-group/ \ + && gem sources --remove https://rubygems.org/ \ + && gem sources -c \ + && gem install ffi \ && gem install fpm \ && chmod +x /usr/bin/rpm-sign-expect \ No newline at end of file From 02b8bda26dfb8732a65419658e4eb98f5e085e6f Mon Sep 17 00:00:00 2001 From: James Jones Date: Sun, 1 Oct 2023 09:36:34 -0400 Subject: [PATCH 14/38] Adding proxy for rubygems --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 630c2ae..30e6177 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,9 +29,9 @@ RUN chown root:root /etc/ssh/ssh_config.d/99-ansible.conf && chmod 644 /etc/ssh/ # Ensuring the fpm tool is installed to build distro packages such as RPM and DEB COPY rpm-sign-expect /usr/bin -RUN gem sources --add https://nexus.jamesjonesconsulting.com/repository/rubygems-group/ \ - && gem sources --remove https://rubygems.org/ \ - && gem sources -c \ - && gem install ffi \ +RUN curl -k -s -o - \ + https://nexus.jamesjonesconsulting.com/repository/package-config/rubygems/rubygems-repos.sh |\ + bash +RUN gem install ffi \ && gem install fpm \ && chmod +x /usr/bin/rpm-sign-expect \ No newline at end of file From 9e48128ff92c46e5d420a5f8dd73f102d10208e9 Mon Sep 17 00:00:00 2001 From: James Jones Date: Sun, 1 Oct 2023 10:25:07 -0400 Subject: [PATCH 15/38] Adding proxy for pypi --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 30e6177..c040b80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,4 +34,9 @@ RUN curl -k -s -o - \ bash RUN gem install ffi \ && gem install fpm \ - && chmod +x /usr/bin/rpm-sign-expect \ No newline at end of file + && chmod +x /usr/bin/rpm-sign-expect + +# Setting up Pypi to use proxy +RUN curl -k -s -o - \ + https://nexus.jamesjonesconsulting.com/repository/package-config/pypi/python3-pypi-repos.sh |\ + bash \ No newline at end of file From 5da253d2d2518de7e724cfe78005c99c401758f3 Mon Sep 17 00:00:00 2001 From: James Jones Date: Sun, 1 Oct 2023 10:38:04 -0400 Subject: [PATCH 16/38] Adding proxy for pypi --- .gitlab-ci.yml | 13 ++++++------- Dockerfile | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad49674..3b3a100 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,13 +20,12 @@ stages: .shared_resources: script: &build_push - - docker login -u "$REGISTRY_USER" -p "$REGISTRY_PASSWORD" $REGISTRY + - podman login -u "$REGISTRY_USER" -p "$REGISTRY_PASSWORD" $REGISTRY - export REGISTRY_IMAGE_LOWER=$(echo "$REGISTRY_IMAGE" | tr '[:upper:]' '[:lower:]') - - docker build --pull -t "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" --build-arg ARTIFACTORY=$HOME_NEXUS_DOCKER_REGISTRY_PROXY . - - docker push "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" + - podman build --pull -t "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" --build-arg ARTIFACTORY=$HOME_NEXUS_DOCKER_REGISTRY_PROXY . + - podman push "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" before_script: &before_auth - - dnf install -y podman-docker - - docker login -u "$HOME_NEXUS_DOCKER_USER" -p "$HOME_NEXUS_DOCKER_PASSWORD" $HOME_NEXUS_DOCKER_REGISTRY_PROXY + - podman login -u "$HOME_NEXUS_DOCKER_USER" -p "$HOME_NEXUS_DOCKER_PASSWORD" $HOME_NEXUS_DOCKER_REGISTRY_PROXY build:prereleases: stage: dind-build @@ -58,8 +57,8 @@ build:releases: script: - export IMAGE_TAG=$CI_COMMIT_TAG - *build_push - - docker tag "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" "$REGISTRY_IMAGE_LOWER:latest" - - docker push "$REGISTRY_IMAGE_LOWER:latest" + - podman tag "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" "$REGISTRY_IMAGE_LOWER:latest" + - podman push "$REGISTRY_IMAGE_LOWER:latest" only: refs: - tags diff --git a/Dockerfile b/Dockerfile index c040b80..90b6ee8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ FROM ${ARTIFACTORY}/podman/stable:latest 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-jsonpatch python3-requests-oauthlib python3-kubernetes python3-pip \ && rpm --import https://packages.microsoft.com/keys/microsoft.asc \ && dnf install -y https://packages.microsoft.com/config/rhel/9.0/packages-microsoft-prod.rpm \ && dnf install -y azure-cli \ From af2358be62426c9a910385cebbaf2b64cf300096 Mon Sep 17 00:00:00 2001 From: James Jones Date: Sun, 4 Feb 2024 12:09:44 -0500 Subject: [PATCH 17/38] Adding on some additional repos and proxy repo configs --- Dockerfile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Dockerfile b/Dockerfile index 90b6ee8..f9886aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,25 @@ ARG ARTIFACTORY FROM ${ARTIFACTORY}/podman/stable:latest +RUN dnf install -y --nogpgcheck \ + https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \ + https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm && \ + dnf groupupdate core -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 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 \ + curl -k -s -o - \ + https://nexus.jamesjonesconsulting.com/repository/package-config/dist/proxy/rpmfusion/rpmfusion-setup-proxy-repos.sh |\ + bash && \ && rpm --import https://packages.microsoft.com/keys/microsoft.asc \ && dnf install -y https://packages.microsoft.com/config/rhel/9.0/packages-microsoft-prod.rpm \ + && curl -k -s -o - \ + https://nexus.jamesjonesconsulting.com/repository/package-config/dist/proxy/microsoft/microsoft-setup-yum-proxy-repos.sh |\ + bash \ && dnf install -y azure-cli \ && dnf install -y rpm-build rpm-sign rubygems ruby-devel gcc gcc-c++ make libffi-devel \ && dnf install -y ansible-collection* \ From 9876714525c0cba64eeb1d7f17a0aaa1b260706f Mon Sep 17 00:00:00 2001 From: James Jones Date: Sun, 4 Feb 2024 13:48:24 -0500 Subject: [PATCH 18/38] Adding on some additional repos and proxy repo configs --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f9886aa..3523866 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,8 @@ ARG ARTIFACTORY FROM ${ARTIFACTORY}/podman/stable:latest RUN dnf install -y --nogpgcheck \ - https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \ - https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm && \ + 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 # Adding on the docker alias, docker-compose and other useful stuff including the Azure CLI and RPM build tools along with FPM From 6f8d8cb5f1a620224b8e132b0ba3a99a0487fe1e Mon Sep 17 00:00:00 2001 From: James Jones Date: Sun, 4 Feb 2024 14:15:22 -0500 Subject: [PATCH 19/38] Adding on some additional repos and proxy repo configs --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3523866..efa0472 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,9 +12,9 @@ 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 \ - curl -k -s -o - \ + && curl -k -s -o - \ https://nexus.jamesjonesconsulting.com/repository/package-config/dist/proxy/rpmfusion/rpmfusion-setup-proxy-repos.sh |\ - bash && \ + bash \ && rpm --import https://packages.microsoft.com/keys/microsoft.asc \ && dnf install -y https://packages.microsoft.com/config/rhel/9.0/packages-microsoft-prod.rpm \ && curl -k -s -o - \ From 023dcdd963d57f8745a41167c5e9a8c00b5b6950 Mon Sep 17 00:00:00 2001 From: James Jones Date: Sun, 4 Feb 2024 16:44:34 -0500 Subject: [PATCH 20/38] Adding on some additional repos and proxy repo configs --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index efa0472..9001421 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,6 +23,7 @@ RUN dnf install -y podman-docker buildah skopeo \ && dnf install -y azure-cli \ && 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-Carton \ && 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 87a4c30cf6c2273b190c1632cd21a5db914b7f1a Mon Sep 17 00:00:00 2001 From: James Jones Date: Sun, 4 Feb 2024 19:43:37 -0500 Subject: [PATCH 21/38] Adding on some additional repos and proxy repo configs --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9001421..0b4cd30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN dnf install -y podman-docker buildah skopeo \ && dnf install -y azure-cli \ && 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-Carton \ + && dnf install -y cpanminus perl-Mojolicious perl-Test-Mojo perl-Carton \ && 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 dfd4eaa07e7b468ac042ea6bbf5a3ed37b329ccd Mon Sep 17 00:00:00 2001 From: James Jones Date: Fri, 9 Feb 2024 21:05:25 -0500 Subject: [PATCH 22/38] Adding perl-Test-Harness for testing purposes --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0b4cd30..7b3921b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN dnf install -y podman-docker buildah skopeo \ && dnf install -y azure-cli \ && 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-Carton \ + && dnf install -y cpanminus perl-Mojolicious perl-Test-Mojo perl-Test-Harness perl-Carton \ && 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 894ead3b8d4ca7d6943fbf7886a3488beba5b506 Mon Sep 17 00:00:00 2001 From: James Jones Date: Sat, 10 Feb 2024 06:39:14 -0500 Subject: [PATCH 23/38] Adding on the CPAN mirror settings for Carton and cpanminus --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7b3921b..9d30e96 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,4 +51,8 @@ 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 \ No newline at end of file + bash + +# Adding on the CPAN mirror settings for Carton and cpanminus +ENV PERL_CPANM_OPT="--mirror https://nexus.jamesjonesconsulting.com/repository/cpan-proxy/" \ + PERL_CARTON_MIRROR=https://nexus.jamesjonesconsulting.com/repository/cpan-proxy/ \ No newline at end of file From bbc14f7a39c3c2051f2e2c654d1e592cc42b3cc9 Mon Sep 17 00:00:00 2001 From: James Jones Date: Sun, 11 Feb 2024 20:33:27 -0500 Subject: [PATCH 24/38] Adding on perlcritic --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9d30e96..99ebdd4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN dnf install -y podman-docker buildah skopeo \ && dnf install -y azure-cli \ && 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-Carton \ + && dnf install -y cpanminus perl-Mojolicious perl-Test-Mojo perl-Test-Harness perl-Perl-Critic perl-Carton \ && 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 32fe4b1aeeda1bf4fe68e39c66e76a2756fa4d0f Mon Sep 17 00:00:00 2001 From: James Jones Date: Wed, 14 Feb 2024 18:28:40 -0500 Subject: [PATCH 25/38] Adding on the sonar-scanner cli --- Dockerfile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Dockerfile b/Dockerfile index 99ebdd4..5141e04 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,9 @@ ARG ARTIFACTORY FROM ${ARTIFACTORY}/podman/stable:latest +ENV SONAR_SCANNER_VERSION=5.0.1.3006 +ENV SONAR_SCANNER_HOME=/opt/sonar-scanner + 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 && \ @@ -32,6 +35,14 @@ RUN dnf install -y podman-docker buildah skopeo \ && 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 ENV ANSIBLE_HOST_KEY_CHECKING=False \ ANSIBLE_TIMEOUT=120 \ From a4a140af58b7cb4614dee99d274b6116b74f8f2e Mon Sep 17 00:00:00 2001 From: James Jones Date: Sat, 4 May 2024 07:18:21 -0400 Subject: [PATCH 26/38] Adding on the OKD client and upgrading to Fedora 40 --- 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 218ea1d2220a1e5ff40d43b608ac55c3db1c3f01 Mon Sep 17 00:00:00 2001 From: James Jones Date: Sat, 4 May 2024 08:55:53 -0400 Subject: [PATCH 27/38] Moving the updated pip into /etc and setting an env var so Python knows where to find it --- 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 2a0b4b2437c6c7acc0567d2cc4b44e308b1afada Mon Sep 17 00:00:00 2001 From: James Jones Date: Mon, 27 May 2024 18:27:28 -0400 Subject: [PATCH 28/38] Adding on the pyyaml python module --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dbcfcf0..7272a6b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN dnf install -y --nogpgcheck \ 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 \ + 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 \ From a9b578492dd5706e9cc50d2bfc85871c954cbc5d Mon Sep 17 00:00:00 2001 From: James Jones Date: Mon, 27 May 2024 18:49:22 -0400 Subject: [PATCH 29/38] Adding on the pyyaml python module --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7272a6b..9176f57 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,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 \ - helm doctl kubernetes-client gnupg2 pinentry expect gh awscli \ + 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 |\ From 82766426d7a7da01fe1a50040f2f40586f164a01 Mon Sep 17 00:00:00 2001 From: James Jones Date: Sun, 2 Jun 2024 09:02:26 -0400 Subject: [PATCH 30/38] Adding SMB support --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9176f57..0000e70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,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 \ - helm doctl gnupg2 pinentry expect gh awscli \ + samba-client samba-common cifs-utils 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 |\ From fd5aacaec3c3ccc31050ca2f356259e05c07d332 Mon Sep 17 00:00:00 2001 From: James Jones Date: Sun, 2 Jun 2024 09:58:21 -0400 Subject: [PATCH 31/38] Adding SMB support --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 0000e70..f213952 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,9 @@ FROM ${ARTIFACTORY}/podman/stable:latest ENV SONAR_SCANNER_VERSION=5.0.1.3006 ENV SONAR_SCANNER_HOME=/opt/sonar-scanner +RUN echo ipv4 >> ~/.curlrc && \ + echo "inet4_only = on" >> ~/.wgetrc + 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 && \ From 6f7777e97fe159b9770169fb1803bde48bcc9227 Mon Sep 17 00:00:00 2001 From: James Jones Date: Sun, 2 Jun 2024 14:23:08 -0400 Subject: [PATCH 32/38] Adding gitlab cli support --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f213952..c86a091 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 \ 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 |\ From f9f455be0ffdc19ce95ad5e2f40e8b97e9f6b7b1 Mon Sep 17 00:00:00 2001 From: James Jones Date: Fri, 6 Sep 2024 13:14:50 -0400 Subject: [PATCH 33/38] Adding yq package as it's now part of Fedora 40 --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c86a091..42b4919 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 glab \ + 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 |\ @@ -34,8 +34,6 @@ RUN dnf install -y podman-docker buildah skopeo \ && 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 \ - && 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 From 99f445fb1a6d992814f7fdaf3d124065a4c4f139 Mon Sep 17 00:00:00 2001 From: James Jones Date: Fri, 6 Sep 2024 16:17:13 -0400 Subject: [PATCH 34/38] Adding yq package as it's now part of Fedora 40 --- Dockerfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 42b4919..c6194c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,18 +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 \ && 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 521c945b3d7055972ac57902d76322b0a43be642 Mon Sep 17 00:00:00 2001 From: James Jones Date: Sat, 16 Nov 2024 21:12:22 +0000 Subject: [PATCH 35/38] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c6194c6..980415c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,8 @@ 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 + dnf update @core -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 From 8001309c9ef5ac36897350c096013c5bbaacdbef Mon Sep 17 00:00:00 2001 From: James Jones Date: Sat, 16 Nov 2024 21:20:32 +0000 Subject: [PATCH 36/38] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 980415c..704e4a2 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 config-manager setopt fedora-cisco-openh264.enabled=1 -y + dnf config-manager setopt fedora-cisco-openh264.enabled=1 -y && \ dnf update @core -y # Adding on the docker alias, docker-compose and other useful stuff including the Azure CLI and RPM build tools along with FPM From ac6ded1d134269c0cb53af6d1b7f79d1438f4867 Mon Sep 17 00:00:00 2001 From: James Jones Date: Sat, 16 Nov 2024 21:29:53 +0000 Subject: [PATCH 37/38] Update Dockerfile --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 704e4a2..9425bec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +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 config-manager setopt fedora-cisco-openh264.enabled=1 -y && \ - dnf update @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 From fcfa11aeb6c9ea52bf2446613a71d10b659c7b76 Mon Sep 17 00:00:00 2001 From: James Jones Date: Sun, 12 Jan 2025 17:06:12 -0500 Subject: [PATCH 38/38] Changing to the new gpg key --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c6194c6..82480da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,9 +30,10 @@ 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 \ + $(curl -k -sS -X 'GET' 'https://nexus.jamesjonesconsulting.com/service/rest/v1/search/assets?sort=version&direction=desc&repository=yum-hosted-arch&yum.architecture=noarch&yum.name=jamesjonesconsulting-repos' |\ + jq '.items[] | .downloadUrl' -r | head -n1) \ && 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 \