Skip to content

Commit

Permalink
Bump Go version from 1.23.1 to 1.23.4, Alpine on Docker images from 3…
Browse files Browse the repository at this point in the history
….20 to 3.21 (#24518)

Kept the Debian-based image at Bullseye.

For #24517.

# Checklist for submitter

- [x] Changes file added for user-visible changes in `changes/`,
`orbit/changes/` or `ee/fleetd-chrome/changes`.
See [Changes
files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/Committing-Changes.md#changes-files)
for more information.
- [x] Manual QA for all new/changed functionality: Validated builds
(Docker and make) all work after this change, except for BitLocker
(requires Windows).
  • Loading branch information
iansltx authored Dec 9, 2024
1 parent c06a6b0 commit 07852b4
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.20.1@sha256:b89d9c93e9ed3597455c90a0b88a8bbb5cb7188438f70953fede212a0c4394e0
FROM alpine:3.21@sha256:2c43f33bd1502ec7818bce9eea60e062d04eeadc4aa31cad9dabecb1e48b647b
LABEL maintainer="Fleet Developers"

RUN apk --update add ca-certificates
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-desktop-linux
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=linux/amd64 golang:1.23.1-bullseye@sha256:45b43371f21ec51276118e6806a22cbb0bca087ddd54c491fdc7149be01035d5
FROM --platform=linux/amd64 golang:1.23.4-bullseye@sha256:c046c91923e7285772f902b98b01f96f7d37387c6a4d5cdd353abc7cf74d2a2b
LABEL maintainer="Fleet Developers"

RUN mkdir -p /usr/src/fleet
Expand Down
1 change: 1 addition & 0 deletions changes/update-go1.23.4
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Updated Go version to 1.23.4
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/fleetdm/fleet/v4

go 1.23.1
go 1.23.4

require (
cloud.google.com/go/pubsub v1.37.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM golang:1.23.1-alpine3.20@sha256:436e2d978524b15498b98faa367553ba6c3655671226f500c72ceb7afb2ef0b1
FROM golang:1.23.4-alpine3.21@sha256:052793ea3143a235a5b2d815ccead8910cfe547b36a1f4c8b070015b89da5eab
ARG TAG
RUN apk add git
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 alpine:3.20@sha256:77726ef6b57ddf65bb551896826ec38bc3e53f75cdde31354fbffb4f25238ebd
FROM alpine:3.21@sha256:2c43f33bd1502ec7818bce9eea60e062d04eeadc4aa31cad9dabecb1e48b647b
LABEL maintainer="Fleet Developers"

# Create FleetDM group and user
Expand Down
1 change: 1 addition & 0 deletions orbit/changes/update-go1.23.4
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Updated Go version to 1.23.4
2 changes: 1 addition & 1 deletion terraform/addons/monitoring/lambda/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/fleetdm/fleet/terraform/addons/monitoring/lambda

go 1.23.1
go 1.23.4

require (
github.com/aws/aws-lambda-go v1.41.0
Expand Down
2 changes: 1 addition & 1 deletion tools/fleet-docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.20.1@sha256:b89d9c93e9ed3597455c90a0b88a8bbb5cb7188438f70953fede212a0c4394e0
FROM alpine:3.21@sha256:2c43f33bd1502ec7818bce9eea60e062d04eeadc4aa31cad9dabecb1e48b647b
LABEL maintainer="Fleet Developers"

RUN apk --update add ca-certificates
Expand Down
4 changes: 2 additions & 2 deletions tools/mdm/migration/mdmproxy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM golang:1.23.1-alpine3.20@sha256:436e2d978524b15498b98faa367553ba6c3655671226f500c72ceb7afb2ef0b1
FROM golang:1.23.4-alpine3.21@sha256:052793ea3143a235a5b2d815ccead8910cfe547b36a1f4c8b070015b89da5eab
ARG TAG
RUN apk update && apk add --no-cache git
RUN git clone -b $TAG --depth=1 --no-tags --progress --no-recurse-submodules https://github.com/fleetdm/fleet.git && cd /go/fleet/tools/mdm/migration/mdmproxy && go build .

FROM alpine:3.20.1@sha256:b89d9c93e9ed3597455c90a0b88a8bbb5cb7188438f70953fede212a0c4394e0
FROM alpine:3.21@sha256:2c43f33bd1502ec7818bce9eea60e062d04eeadc4aa31cad9dabecb1e48b647b
LABEL maintainer="Fleet Developers"

RUN apk update && apk add --no-cache tini
Expand Down
2 changes: 1 addition & 1 deletion tools/mdm/windows/bitlocker/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module bitlocker

go 1.23.1
go 1.23.4

require github.com/go-ole/go-ole v1.3.0

Expand Down
2 changes: 1 addition & 1 deletion tools/terraform/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module terraform-provider-fleetdm

go 1.23.1
go 1.23.4

require (
github.com/hashicorp/terraform-plugin-framework v1.7.0
Expand Down

0 comments on commit 07852b4

Please sign in to comment.