Merge pull request #39 from ppodgorsek/dependency-upgrades

Dependency upgrades

Containerfile

@@ -1,18 +1,18 @@
 # The source of the parent container can be found here:
 # https://github.com/ansible/awx-ee
 
-FROM quay.io/ansible/awx-ee:23.7.0
+FROM quay.io/ansible/awx-ee:24.6.1
 
-MAINTAINER Paul Podgorsek <ppodgorsek@users.noreply.github.com>
+MAINTAINER Paul Podgorsek
 LABEL description Ansible AWX Execution Environment container with Cloud providers, Terraform, Kubernetes and other common tools.
 
-ENV ANSIBLE_COLLECTION_AWS_VERSION     7.2.0
-ENV ANSIBLE_COLLECTION_AZURE_VERSION   v1.19.0
+ENV ANSIBLE_COLLECTION_AWS_VERSION     8.1.0
+ENV ANSIBLE_COLLECTION_AZURE_VERSION   v2.6.0
 ENV ANSIBLE_COLLECTION_GCP_VERSION     v1.3.0
-ENV HELM_VERSION                       v3.14.0
+ENV HELM_VERSION                       v3.15.4
 ENV JAVA_VERSION                       21
 ENV POSTGRESQL_VERSION                 16
-ENV TERRAFORM_VERSION                  1.7.3
+ENV TERRAFORM_VERSION                  1.9.5
 
 USER root
 
@@ -29,7 +29,7 @@ RUN dnf upgrade -y > /dev/null \
 RUN pip3 install -r https://raw.githubusercontent.com/ansible-collections/amazon.aws/${ANSIBLE_COLLECTION_AWS_VERSION}/requirements.txt
 
 # Cloud: Azure
-RUN pip3 install -r https://raw.githubusercontent.com/ansible-collections/azure/${ANSIBLE_COLLECTION_AZURE_VERSION}/requirements-azure.txt
+RUN pip3 install -r https://raw.githubusercontent.com/ansible-collections/azure/${ANSIBLE_COLLECTION_AZURE_VERSION}/requirements.txt
 
 # Cloud: Google Cloud Platform (GCP)
 RUN pip3 install -r https://raw.githubusercontent.com/ansible-collections/google.cloud/${ANSIBLE_COLLECTION_GCP_VERSION}/requirements.txt
@@ -59,7 +59,7 @@ RUN pip3 install psycopg2-binary
 # Official documentation: https://developer.hashicorp.com/terraform/install
 RUN yum install -y yum-utils \
   && yum-config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo \
-  && yum install -y terraform \
+  && yum install -y terraform-${TERRAFORM_VERSION}* \
   && yum clean all
 
 # Fix a bug in the runner's home directory

README.md

@@ -29,7 +29,7 @@ It is based on the official Ansible AWX EE image and mainly includes:
 * Java 21
 * Kubernetes & Helm
 * PostgreSQL 16
-* Terraform 1.7.3
+* Terraform 1.9.5
 
 <a name="versioning"></a>
 

conf/kubernetes.repo

@@ -1,7 +1,7 @@
 [kubernetes]
 name=Kubernetes
-baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
+baseurl=https://pkgs.k8s.io/core:/stable:/v1.31/rpm/
 enabled=1
 gpgcheck=1
 repo_gpgcheck=1
-gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
+gpgkey=https://pkgs.k8s.io/core:/stable:/v1.31/rpm/repodata/repomd.xml.key