From 5c3b6557cbac579991b923590fcc734b91d91d7a Mon Sep 17 00:00:00 2001
From: Automate Terraform <vma@gecko.de>
Date: Tue, 22 Oct 2024 08:58:32 +0200
Subject: [PATCH 1/2] upgrade alpine, ansible and terraform to the latest
 versions

---
 deployment/docker/debug/Dockerfile  | 6 +++---
 deployment/docker/runner/Dockerfile | 8 ++++----
 deployment/docker/server/Dockerfile | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/deployment/docker/debug/Dockerfile b/deployment/docker/debug/Dockerfile
index df0e8fad7..e37f269c2 100644
--- a/deployment/docker/debug/Dockerfile
+++ b/deployment/docker/debug/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.22-alpine3.18 as builder
+FROM --platform=$BUILDPLATFORM golang:1.22-alpine3.20 as builder
 
 RUN go install github.com/go-delve/delve/cmd/dlv@latest
 
@@ -25,7 +25,7 @@ RUN --mount=type=cache,target=/go/pkg \
     task deps && \
     task build:debug GOOS=${TARGETOS} GOARCH=${TARGETARCH}
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 RUN apk add --no-cache -U \
 bash curl git gnupg mysql-client openssh-client-default python3 python3-dev py3-pip rsync sshpass tar tini tzdata unzip wget zip build-base openssl-dev libffi-dev cargo && \
@@ -54,7 +54,7 @@ WORKDIR /home/semaphore
 USER 1001
 
 # renovate: datasource=pypi depName=ansible
-ENV ANSIBLE_VERSION 9.4.0
+ENV ANSIBLE_VERSION 10.5.0
 
 RUN mkdir /opt/semaphore/venv
 
diff --git a/deployment/docker/runner/Dockerfile b/deployment/docker/runner/Dockerfile
index fb082a79a..e05ee3a52 100644
--- a/deployment/docker/runner/Dockerfile
+++ b/deployment/docker/runner/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.22-alpine3.18 as builder
+FROM --platform=$BUILDPLATFORM golang:1.22-alpine3.20 as builder
 
 RUN apk add --no-cache -U \
     libc-dev curl nodejs npm git gcc zip unzip tar
@@ -25,7 +25,7 @@ RUN --mount=type=cache,target=/go/pkg \
 
 
 ENV OPENTOFU_VERSION="1.7.0"
-ENV TERRAFORM_VERSION="1.8.2"
+ENV TERRAFORM_VERSION="1.9.8"
 #ENV PULUMI_VERSION="3.116.1"
 
 RUN wget https://github.com/opentofu/opentofu/releases/download/v${OPENTOFU_VERSION}/tofu_${OPENTOFU_VERSION}_linux_${TARGETARCH}.tar.gz && \
@@ -45,7 +45,7 @@ RUN curl -O https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraf
 #RUN tar xf pulumi.tar.gz --strip-components=1 -C /usr/local/bin
 #RUN rm pulumi.tar.gz
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 ARG TARGETARCH="amd64"
 
@@ -77,7 +77,7 @@ RUN chown -R semaphore:0 /usr/local/bin/runner-wrapper && \
 WORKDIR /home/semaphore
 
 # renovate: datasource=pypi depName=ansible
-ENV ANSIBLE_VERSION 9.4.0
+ENV ANSIBLE_VERSION 10.5.0
 ARG ANSIBLE_VENV_PATH=/opt/semaphore/apps/ansible/${ANSIBLE_VERSION}/venv
 
 RUN apk add --no-cache -U python3-dev build-base openssl-dev libffi-dev cargo && \
diff --git a/deployment/docker/server/Dockerfile b/deployment/docker/server/Dockerfile
index 2e0e053ed..ea1421b64 100644
--- a/deployment/docker/server/Dockerfile
+++ b/deployment/docker/server/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.22-alpine3.18 as builder
+FROM --platform=$BUILDPLATFORM golang:1.22-alpine3.20 as builder
 
 RUN apk add --no-cache -U \
     libc-dev curl nodejs npm git gcc zip unzip tar
@@ -25,7 +25,7 @@ RUN --mount=type=cache,target=/go/pkg \
 
 
 ENV OPENTOFU_VERSION="1.7.0"
-ENV TERRAFORM_VERSION="1.8.2"
+ENV TERRAFORM_VERSION="1.9.8"
 #ENV PULUMI_VERSION="3.116.1"
 
 RUN wget https://github.com/opentofu/opentofu/releases/download/v${OPENTOFU_VERSION}/tofu_${OPENTOFU_VERSION}_linux_${TARGETARCH}.tar.gz && \
@@ -45,11 +45,11 @@ RUN curl -O https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraf
 #RUN tar xf pulumi.tar.gz --strip-components=1 -C /usr/local/bin
 #RUN rm pulumi.tar.gz
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 ARG TARGETARCH="amd64"
 # renovate: datasource=pypi depName=ansible
-ENV ANSIBLE_VERSION 9.4.0
+ENV ANSIBLE_VERSION 10.5.0
 ARG ANSIBLE_VENV_PATH=/opt/semaphore/apps/ansible/${ANSIBLE_VERSION}/venv
 
 RUN apk add --no-cache -U \

From 734ff0447de0421321ae181f543210af5af29d8e Mon Sep 17 00:00:00 2001
From: lug-gh <24546639+lug-gh@users.noreply.github.com>
Date: Thu, 7 Nov 2024 09:32:29 +0100
Subject: [PATCH 2/2] bump ansible to 10.6.0

---
 deployment/docker/debug/Dockerfile  | 2 +-
 deployment/docker/runner/Dockerfile | 2 +-
 deployment/docker/server/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deployment/docker/debug/Dockerfile b/deployment/docker/debug/Dockerfile
index e37f269c2..4d3378a1f 100644
--- a/deployment/docker/debug/Dockerfile
+++ b/deployment/docker/debug/Dockerfile
@@ -54,7 +54,7 @@ WORKDIR /home/semaphore
 USER 1001
 
 # renovate: datasource=pypi depName=ansible
-ENV ANSIBLE_VERSION 10.5.0
+ENV ANSIBLE_VERSION 10.6.0
 
 RUN mkdir /opt/semaphore/venv
 
diff --git a/deployment/docker/runner/Dockerfile b/deployment/docker/runner/Dockerfile
index e05ee3a52..7e088469c 100644
--- a/deployment/docker/runner/Dockerfile
+++ b/deployment/docker/runner/Dockerfile
@@ -77,7 +77,7 @@ RUN chown -R semaphore:0 /usr/local/bin/runner-wrapper && \
 WORKDIR /home/semaphore
 
 # renovate: datasource=pypi depName=ansible
-ENV ANSIBLE_VERSION 10.5.0
+ENV ANSIBLE_VERSION 10.6.0
 ARG ANSIBLE_VENV_PATH=/opt/semaphore/apps/ansible/${ANSIBLE_VERSION}/venv
 
 RUN apk add --no-cache -U python3-dev build-base openssl-dev libffi-dev cargo && \
diff --git a/deployment/docker/server/Dockerfile b/deployment/docker/server/Dockerfile
index ea1421b64..9622c85b7 100644
--- a/deployment/docker/server/Dockerfile
+++ b/deployment/docker/server/Dockerfile
@@ -49,7 +49,7 @@ FROM alpine:3.20
 
 ARG TARGETARCH="amd64"
 # renovate: datasource=pypi depName=ansible
-ENV ANSIBLE_VERSION 10.5.0
+ENV ANSIBLE_VERSION 10.6.0
 ARG ANSIBLE_VENV_PATH=/opt/semaphore/apps/ansible/${ANSIBLE_VERSION}/venv
 
 RUN apk add --no-cache -U \