Merge branch 'master' into OPS-5193-kubernetes-update-1-26

hpi-schul-cloud · Feb 21, 2024 · 355696e · 355696e
2 parents de62de4 + 47cecdc
commit 355696e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/awx-ee/Dockerfile b/awx-ee/Dockerfile
@@ -82,6 +82,7 @@ ARG OP_VERSION=2.24.0
 RUN pip3 install --upgrade pip setuptools
 RUN dnf install -y unzip
 RUN dnf install -y openssl
+RUN dnf upgrade libcurl-minimal -y
 RUN cd /tmp && curl -LO https://releases.hashicorp.com/terraform/$TERRAFORM_VERSION/terraform_${TERRAFORM_VERSION}_linux_amd64.zip && unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip && install -o root -g root -m 0755 terraform /usr/local/bin/terraform
 RUN curl -LO https://dl.k8s.io/release/v$KUBECTL_VERSION/bin/linux/amd64/kubectl
 RUN install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl

diff --git a/awx-ee/execution-environment.yml b/awx-ee/execution-environment.yml
@@ -26,6 +26,7 @@ additional_build_steps:
     RUN pip3 install --upgrade pip setuptools
     RUN dnf install -y unzip
     RUN dnf install -y openssl
+    RUN dnf upgrade libcurl-minimal -y
     RUN cd /tmp && curl -LO https://releases.hashicorp.com/terraform/$TERRAFORM_VERSION/terraform_${TERRAFORM_VERSION}_linux_amd64.zip && unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip && install -o root -g root -m 0755 terraform /usr/local/bin/terraform
     RUN curl -LO https://dl.k8s.io/release/$KUBECTL_VERSION/bin/linux/amd64/kubectl
     RUN install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl