diff --git a/.github/workflows/deploy-fleet-website.yml b/.github/workflows/deploy-fleet-website.yml index 347e5d499b..5cc91ed50d 100644 --- a/.github/workflows/deploy-fleet-website.yml +++ b/.github/workflows/deploy-fleet-website.yml @@ -59,7 +59,7 @@ jobs: - name: Set up Go uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version: 1.21 + go-version: ${{ vars.GO_VERSION }} # Download top-level dependencies and build Storybook in the website's assets/ folder - run: npm install --legacy-peer-deps && npm run build-storybook -- -o ./website/assets/storybook --loglevel verbose diff --git a/.github/workflows/dogfood-deploy.yml b/.github/workflows/dogfood-deploy.yml index ddf28f0558..ca1f6d4be9 100644 --- a/.github/workflows/dogfood-deploy.yml +++ b/.github/workflows/dogfood-deploy.yml @@ -51,7 +51,7 @@ jobs: - name: Set up Go uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version: '1.21' + go-version: ${{ vars.GO_VERSION }} - uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3 with: terraform_version: 1.6.3 diff --git a/.github/workflows/fleetctl-preview-latest.yml b/.github/workflows/fleetctl-preview-latest.yml index dd606282ff..8c46e1d484 100644 --- a/.github/workflows/fleetctl-preview-latest.yml +++ b/.github/workflows/fleetctl-preview-latest.yml @@ -51,7 +51,7 @@ jobs: # - Unattended installation of Docker on macOS fails. (see # https://github.com/docker/for-mac/issues/6450) os: [ubuntu-latest] - go-version: ['1.21.1'] + go-version: ['${{ vars.GO_VERSION }}'] runs-on: ${{ matrix.os }} steps: diff --git a/Dockerfile-desktop-linux b/Dockerfile-desktop-linux index 59d1f12ad8..58956b8cad 100644 --- a/Dockerfile-desktop-linux +++ b/Dockerfile-desktop-linux @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 golang:1.21.3-bullseye@sha256:bea700cb2a4b3df3add033cea317d5e1dd7a59412d1b6fe25ceb257bcfdc6a1d +FROM --platform=linux/amd64 golang:1.21.5-bullseye@sha256:5ebf2823dcead16c6cb1499b1e25ca2aa9b3098ac3ccb7f68cc2f4143535addc LABEL maintainer="Fleet Developers" RUN apt-get update && apt-get install -y \ diff --git a/changes/go-update b/changes/go-update new file mode 100644 index 0000000000..ad3412ceb3 --- /dev/null +++ b/changes/go-update @@ -0,0 +1 @@ +* Updated Go to v1.21.5 diff --git a/infrastructure/loadtesting/terraform/docker/loadtest.Dockerfile b/infrastructure/loadtesting/terraform/docker/loadtest.Dockerfile index 06aa1314e2..64a6b075cf 100644 --- a/infrastructure/loadtesting/terraform/docker/loadtest.Dockerfile +++ b/infrastructure/loadtesting/terraform/docker/loadtest.Dockerfile @@ -1,7 +1,7 @@ -FROM golang:1.21.3@sha256:d0214956a9c50c300e430c1f6c0a820007ace238e5242c53762e61b344659e05 +FROM golang:1.21.5@sha256:4e2551bdfcc449e1363284ddba11e89607d88e915674b6f654a7a5bf47a83200 ARG TAG RUN git clone -b $TAG --depth=1 --no-tags --progress --no-recurse-submodules https://github.com/fleetdm/fleet.git && cd /go/fleet/cmd/osquery-perf/ && go build . -FROM golang:1.21.3@sha256:d0214956a9c50c300e430c1f6c0a820007ace238e5242c53762e61b344659e05 +FROM golang:1.21.5@sha256:4e2551bdfcc449e1363284ddba11e89607d88e915674b6f654a7a5bf47a83200 COPY --from=0 /go/fleet/cmd/osquery-perf/osquery-perf /go/osquery-perf diff --git a/infrastructure/sandbox/JITProvisioner/deprovisioner/Dockerfile b/infrastructure/sandbox/JITProvisioner/deprovisioner/Dockerfile index b6cf9d91b8..adfd4596f6 100644 --- a/infrastructure/sandbox/JITProvisioner/deprovisioner/Dockerfile +++ b/infrastructure/sandbox/JITProvisioner/deprovisioner/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.3-alpine@sha256:27c76dcf886c5024320f4fa8ceb57d907494a3bb3d477d0aa7ac8385acd871ea AS builder +FROM golang:1.21.5-alpine@sha256:55f716237933c85cee01748700755b4ac8736fb1ca974c9aed051691b68d6dc2 AS builder RUN apk update && apk add --no-cache git curl openssl unzip WORKDIR /build COPY . . diff --git a/infrastructure/sandbox/JITProvisioner/ingress_destroyer/Dockerfile b/infrastructure/sandbox/JITProvisioner/ingress_destroyer/Dockerfile index a7831ff041..da8687cad5 100644 --- a/infrastructure/sandbox/JITProvisioner/ingress_destroyer/Dockerfile +++ b/infrastructure/sandbox/JITProvisioner/ingress_destroyer/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.3-bullseye@sha256:27b021393d0e0dfffc6cd6cca5e7836ac59f5ac98724c5d6b3b0a82199d275c5 as BUILDER +FROM golang:1.21.5-bullseye@sha256:5ebf2823dcead16c6cb1499b1e25ca2aa9b3098ac3ccb7f68cc2f4143535addc as BUILDER WORKDIR /src RUN apt update && apt upgrade -y diff --git a/infrastructure/sandbox/JITProvisioner/lambda/Dockerfile b/infrastructure/sandbox/JITProvisioner/lambda/Dockerfile index ab84c8ed11..4054f724d8 100644 --- a/infrastructure/sandbox/JITProvisioner/lambda/Dockerfile +++ b/infrastructure/sandbox/JITProvisioner/lambda/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.3-alpine@sha256:27c76dcf886c5024320f4fa8ceb57d907494a3bb3d477d0aa7ac8385acd871ea AS builder +FROM golang:1.21.5-alpine@sha256:55f716237933c85cee01748700755b4ac8736fb1ca974c9aed051691b68d6dc2 AS builder WORKDIR /build COPY . . RUN go get -d -v diff --git a/infrastructure/sandbox/Monitoring/lambda/Dockerfile b/infrastructure/sandbox/Monitoring/lambda/Dockerfile index 085033894a..146d30d997 100644 --- a/infrastructure/sandbox/Monitoring/lambda/Dockerfile +++ b/infrastructure/sandbox/Monitoring/lambda/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.3-alpine@sha256:27c76dcf886c5024320f4fa8ceb57d907494a3bb3d477d0aa7ac8385acd871ea AS builder +FROM golang:1.21.5-alpine@sha256:55f716237933c85cee01748700755b4ac8736fb1ca974c9aed051691b68d6dc2 AS builder WORKDIR /build COPY . . RUN go get -d -v diff --git a/infrastructure/sandbox/PreProvisioner/lambda/Dockerfile b/infrastructure/sandbox/PreProvisioner/lambda/Dockerfile index e73d1ccdb5..ee1d79e4f1 100644 --- a/infrastructure/sandbox/PreProvisioner/lambda/Dockerfile +++ b/infrastructure/sandbox/PreProvisioner/lambda/Dockerfile @@ -6,7 +6,7 @@ RUN cargo install --version 0.16.0 apple-codesign \ && curl -sSf $transporter_url -o transporter_install.sh \ && sh transporter_install.sh --target transporter --accept --noexec -FROM golang:1.21.3-bullseye@sha256:27b021393d0e0dfffc6cd6cca5e7836ac59f5ac98724c5d6b3b0a82199d275c5 +FROM golang:1.21.5-bullseye@sha256:5ebf2823dcead16c6cb1499b1e25ca2aa9b3098ac3ccb7f68cc2f4143535addc RUN apt-get update \ && dpkg --add-architecture i386 \ diff --git a/orbit/changes/go-update b/orbit/changes/go-update new file mode 100644 index 0000000000..ad3412ceb3 --- /dev/null +++ b/orbit/changes/go-update @@ -0,0 +1 @@ +* Updated Go to v1.21.5