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.

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

Upgrade Ansible, Terraform and Alpine #2471

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions deployment/docker/debug/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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 && \
Expand Down Expand Up @@ -54,7 +54,7 @@ WORKDIR /home/semaphore
USER 1001

# renovate: datasource=pypi depName=ansible
ENV ANSIBLE_VERSION 9.4.0
ENV ANSIBLE_VERSION 10.6.0

RUN mkdir /opt/semaphore/venv

Expand Down
8 changes: 4 additions & 4 deletions deployment/docker/runner/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 && \
Expand All @@ -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"

Expand Down Expand Up @@ -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.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 && \
Expand Down
8 changes: 4 additions & 4 deletions deployment/docker/server/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 && \
Expand All @@ -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.6.0
ARG ANSIBLE_VENV_PATH=/opt/semaphore/apps/ansible/${ANSIBLE_VERSION}/venv

RUN apk add --no-cache -U \
Expand Down
Loading