Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency upgrades #39

Merged
merged 6 commits into from
Aug 25, 2024
Merged

Dependency upgrades #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a3fe77
Issue #33 - Upgrade the AWS Ansible Collection to version 8.1.0
ppodgorsek Aug 25, 2024
8e2f598
Issue #34 - Upgrade the Azure Ansible Collection to version 2.6.0
ppodgorsek Aug 25, 2024
bb19815
Issue #35 - Upgrade Helm to version 3.15.4
ppodgorsek Aug 25, 2024
2e655ca
Issue #36 - Upgrade the base image to version 24.6.1
ppodgorsek Aug 25, 2024
aff7432
Issue #37 - Upgrade Terraform to version 1.9.5
ppodgorsek Aug 25, 2024
8d8dfa6
Issue #38 - Kubernetes cannot be downloaded via yum
ppodgorsek Aug 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions conf/kubernetes.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading