From e355a5fb4af59d4554f5afd6a9ebf1db47b859cd Mon Sep 17 00:00:00 2001 From: Paul Podgorsek Date: Sun, 11 Dec 2022 21:57:21 +0000 Subject: [PATCH 1/5] Issue #10 - Upgrade the Ansible AWS collection to version 5.1.0 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index ce0646e..6e6c4a4 100644 --- a/Containerfile +++ b/Containerfile @@ -6,7 +6,7 @@ FROM quay.io/ansible/awx-ee:latest MAINTAINER Paul Podgorsek LABEL description Ansible AWX Execution Environment container with Cloud providers, Terraform, Kubernetes and other common tools. -ENV ANSIBLE_COLLECTION_AWS_VERSION 3.3.0 +ENV ANSIBLE_COLLECTION_AWS_VERSION 5.1.0 ENV ANSIBLE_COLLECTION_AZURE_VERSION v1.13.0 ENV ANSIBLE_COLLECTION_GCP_VERSION 1.0.2 ENV HELM_VERSION v3.8.1 From bb0c9ca0d8df91e7f24a8cc37972a4770c86232c Mon Sep 17 00:00:00 2001 From: Paul Podgorsek Date: Sun, 11 Dec 2022 21:57:48 +0000 Subject: [PATCH 2/5] Issue #11 - Upgrade the Ansible Azure collection to version 1.14.0 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 6e6c4a4..0d7767f 100644 --- a/Containerfile +++ b/Containerfile @@ -7,7 +7,7 @@ MAINTAINER Paul Podgorsek LABEL description Ansible AWX Execution Environment container with Cloud providers, Terraform, Kubernetes and other common tools. ENV ANSIBLE_COLLECTION_AWS_VERSION 5.1.0 -ENV ANSIBLE_COLLECTION_AZURE_VERSION v1.13.0 +ENV ANSIBLE_COLLECTION_AZURE_VERSION v1.14.0 ENV ANSIBLE_COLLECTION_GCP_VERSION 1.0.2 ENV HELM_VERSION v3.8.1 ENV JAVA_VERSION 17 From 70c9d124c44c918856253c5dd3a7d062fd270432 Mon Sep 17 00:00:00 2001 From: Paul Podgorsek Date: Sun, 11 Dec 2022 21:58:26 +0000 Subject: [PATCH 3/5] Issue #12 - Upgrade Helm to version v3.10.2 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 0d7767f..5a7f94b 100644 --- a/Containerfile +++ b/Containerfile @@ -9,7 +9,7 @@ LABEL description Ansible AWX Execution Environment container with Cloud provide ENV ANSIBLE_COLLECTION_AWS_VERSION 5.1.0 ENV ANSIBLE_COLLECTION_AZURE_VERSION v1.14.0 ENV ANSIBLE_COLLECTION_GCP_VERSION 1.0.2 -ENV HELM_VERSION v3.8.1 +ENV HELM_VERSION v3.10.2 ENV JAVA_VERSION 17 ENV POSTGRESQL_VERSION 14 ENV TERRAFORM_VERSION 1.2.3 From e29b3c48111dc620883780cf202ae0b27f2b6de1 Mon Sep 17 00:00:00 2001 From: Paul Podgorsek Date: Sun, 11 Dec 2022 21:59:24 +0000 Subject: [PATCH 4/5] Issue #13 - Upgrade Terraform to version 1.3.6 --- Containerfile | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index 5a7f94b..fde11c2 100644 --- a/Containerfile +++ b/Containerfile @@ -12,7 +12,7 @@ ENV ANSIBLE_COLLECTION_GCP_VERSION 1.0.2 ENV HELM_VERSION v3.10.2 ENV JAVA_VERSION 17 ENV POSTGRESQL_VERSION 14 -ENV TERRAFORM_VERSION 1.2.3 +ENV TERRAFORM_VERSION 1.3.6 USER root diff --git a/README.md b/README.md index 9121c61..ea21ba9 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ It is based on the official Ansible AWX EE image and mainly includes: * Java 17 * Kubernetes & Helm * PostgreSQL 14 -* Terraform 1.2.3 +* Terraform 1.3.6 ## Versioning From 47963296dd35e47f06ab7784205f03cc9d809428 Mon Sep 17 00:00:00 2001 From: Paul Podgorsek Date: Sun, 11 Dec 2022 22:14:52 +0000 Subject: [PATCH 5/5] Issue #14 - Install the Helm Diff plugin --- Containerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index fde11c2..8d03b79 100644 --- a/Containerfile +++ b/Containerfile @@ -47,7 +47,8 @@ RUN pip3 install kubernetes RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/${HELM_VERSION}/scripts/get-helm-3 \ && chmod 700 get_helm.sh \ && ./get_helm.sh --version ${HELM_VERSION} \ - && rm -f get_helm.sh + && rm -f get_helm.sh \ + && helm plugin install https://github.com/databus23/helm-diff # PostgreSQL RUN dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \