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

Update build image to 1.23.3 and the build image to v0.1.7. #2130

Merged
merged 13 commits into from
Nov 21, 2024
58 changes: 29 additions & 29 deletions .drone/drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ steps:
- commands:
- apt-get update -y && apt-get install -y libsystemd-dev
- make lint
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Lint
trigger:
event:
Expand All @@ -125,7 +125,7 @@ platform:
steps:
- commands:
- make GO_TAGS="nodocker" test
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Run Go tests
trigger:
event:
Expand All @@ -140,7 +140,7 @@ platform:
steps:
- commands:
- K8S_USE_DOCKER_NETWORK=1 make test
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Run Go tests
volumes:
- name: docker
Expand All @@ -164,7 +164,7 @@ steps:
- commands:
- '& "C:/Program Files/git/bin/bash.exe" -c ''go test -tags="nodocker,nonetwork"
./...'''
image: grafana/alloy-build-image:v0.1.6-windows
image: grafana/alloy-build-image:v0.1.7-windows
name: Run Go tests
trigger:
ref:
Expand All @@ -179,7 +179,7 @@ platform:
steps:
- commands:
- make alloy-image
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Build container
volumes:
- name: docker
Expand All @@ -205,7 +205,7 @@ platform:
steps:
- commands:
- '& "C:/Program Files/git/bin/bash.exe" -c "make alloy-image-windows"'
image: grafana/alloy-build-image:v0.1.6-windows
image: grafana/alloy-build-image:v0.1.7-windows
name: Build container
volumes:
- name: docker
Expand All @@ -232,7 +232,7 @@ steps:
- make generate-ui
- GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM=
make alloy
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Build
trigger:
event:
Expand All @@ -249,7 +249,7 @@ steps:
- make generate-ui
- GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM=
make alloy
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Build
trigger:
event:
Expand All @@ -266,7 +266,7 @@ steps:
- make generate-ui
- GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=ppc64le GOARM=
make alloy
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Build
trigger:
event:
Expand All @@ -283,7 +283,7 @@ steps:
- make generate-ui
- GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=s390x GOARM=
make alloy
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Build
trigger:
event:
Expand All @@ -299,7 +299,7 @@ steps:
- commands:
- make generate-ui
- GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make alloy
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Build
trigger:
event:
Expand All @@ -315,7 +315,7 @@ steps:
- commands:
- make generate-ui
- GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make alloy
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Build
trigger:
event:
Expand All @@ -331,7 +331,7 @@ steps:
- commands:
- make generate-ui
- GO_TAGS="builtinassets" GOOS=windows GOARCH=amd64 GOARM= make alloy
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Build
trigger:
event:
Expand All @@ -347,7 +347,7 @@ steps:
- commands:
- make generate-ui
- GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make alloy
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Build
trigger:
event:
Expand All @@ -364,7 +364,7 @@ steps:
- make generate-ui
- GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM=
GOEXPERIMENT=boringcrypto make alloy
image: grafana/alloy-build-image:v0.1.6-boringcrypto
image: grafana/alloy-build-image:v0.1.7-boringcrypto
name: Build
trigger:
event:
Expand All @@ -381,7 +381,7 @@ steps:
- make generate-ui
- GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM=
GOEXPERIMENT=boringcrypto make alloy
image: grafana/alloy-build-image:v0.1.6-boringcrypto
image: grafana/alloy-build-image:v0.1.7-boringcrypto
name: Build
trigger:
event:
Expand All @@ -397,7 +397,7 @@ steps:
- commands:
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
failure: ignore
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Configure QEMU
volumes:
- name: docker
Expand All @@ -417,7 +417,7 @@ steps:
from_secret: docker_password
GCR_CREDS:
from_secret: gcr_admin
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Publish container
volumes:
- name: docker
Expand All @@ -440,7 +440,7 @@ steps:
- commands:
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
failure: ignore
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Configure QEMU
volumes:
- name: docker
Expand All @@ -460,7 +460,7 @@ steps:
from_secret: docker_password
GCR_CREDS:
from_secret: gcr_admin
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Publish container
volumes:
- name: docker
Expand Down Expand Up @@ -494,7 +494,7 @@ steps:
from_secret: docker_password
GCR_CREDS:
from_secret: gcr_admin
image: grafana/alloy-build-image:v0.1.6-windows
image: grafana/alloy-build-image:v0.1.7-windows
name: Build containers
volumes:
- name: docker
Expand All @@ -517,7 +517,7 @@ steps:
- commands:
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
failure: ignore
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Configure QEMU
volumes:
- name: docker
Expand All @@ -537,7 +537,7 @@ steps:
from_secret: docker_password
GCR_CREDS:
from_secret: gcr_admin
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Publish container
volumes:
- name: docker
Expand All @@ -560,7 +560,7 @@ steps:
- commands:
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
failure: ignore
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Configure QEMU
volumes:
- name: docker
Expand All @@ -580,7 +580,7 @@ steps:
from_secret: docker_password
GCR_CREDS:
from_secret: gcr_admin
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Publish container
volumes:
- name: docker
Expand Down Expand Up @@ -614,7 +614,7 @@ steps:
from_secret: docker_password
GCR_CREDS:
from_secret: gcr_admin
image: grafana/alloy-build-image:v0.1.6-windows
image: grafana/alloy-build-image:v0.1.7-windows
name: Build containers
volumes:
- name: docker
Expand Down Expand Up @@ -715,7 +715,7 @@ steps:
from_secret: gpg_private_key
GPG_PUBLIC_KEY:
from_secret: gpg_public_key
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Publish release
volumes:
- name: docker
Expand All @@ -738,7 +738,7 @@ steps:
- commands:
- DOCKER_OPTS="" make dist/alloy-linux-amd64
- DOCKER_OPTS="" make test-packages
image: grafana/alloy-build-image:v0.1.6
image: grafana/alloy-build-image:v0.1.7
name: Test Linux system packages
volumes:
- name: docker
Expand Down Expand Up @@ -836,6 +836,6 @@ kind: secret
name: updater_private_key
---
kind: signature
hmac: 4dfd6aff0a0f50f6d95e84563afe02bc941cdc2ac4447aebe2ba97492f6e7db2
hmac: 10e6be95fbe639c7701a96c7b0523e849b28389d09eda8b122de3c981a93c4c0

...
12 changes: 10 additions & 2 deletions .github/workflows/check-linux-build-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,19 @@ on:

jobs:
check-linux-build-image:
runs-on: ubuntu-latest
runs-on: github-hosted-ubuntu-x64-large
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Remove unnecessary files
run: |
rm -rf /usr/share/dotnet
rm -rf "$AGENT_TOOLSDIRECTORY"
rm -rf /opt/ghc
rm -rf "/usr/local/share/boost"
rm -rf /opt/hostedtoolcache

- name: Setup QEMU
uses: docker/setup-qemu-action@v3

Expand All @@ -25,7 +33,7 @@ jobs:
push: false
tags: grafana/alloy-build-image:latest
build-args: |
GO_RUNTIME=golang:1.22.3-bullseye
GO_RUNTIME=golang:1.23.3-bullseye

- name: Create test Linux build image for boring crypto
uses: docker/build-push-action@v6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
# platform, but we're really only looking for issues that are
# architecture-independent.
linux:
runs-on: ubuntu-latest
runs-on: github-hosted-ubuntu-x64-large
mattdurham marked this conversation as resolved.
Show resolved Hide resolved
steps:
- uses: actions/checkout@v4
- name: Build image
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fuzz-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up Go 1.22
- name: Set up Go 1.23
uses: actions/setup-go@v5
with:
go-version: "1.22"
go-version: "1.23"
cache: false

- name: Find cache location
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: "1.22"
go-version: "1.23"
- name: Set OTEL Exporter Endpoint
run: echo "OTEL_EXPORTER_ENDPOINT=172.17.0.1:4318" >> $GITHUB_ENV
- name: Run tests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Set up Go 1.22
- name: Set up Go 1.23
uses: actions/setup-go@v5
with:
go-version: "1.22"
go-version: "1.23"
cache: true
- name: Test
run: CGO_LDFLAGS="-ld_classic $CGO_LDFLAGS" make GO_TAGS="nodocker" test
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ Main (unreleased)

- Change the stability of the `livedebugging` feature from "experimental" to "generally available". (@wildum)

- Use Go 1.23.3 for builds. (@mattdurham)


v1.5.0
-----------------

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# default when running `docker buildx build` or when DOCKER_BUILDKIT=1 is set
# in environment variables.

FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.6 as build
FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.7 as build
ARG BUILDPLATFORM
ARG TARGETPLATFORM
ARG TARGETOS
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.windows
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM grafana/alloy-build-image:v0.1.6-windows as builder
FROM grafana/alloy-build-image:v0.1.7-windows as builder
ARG VERSION
ARG RELEASE_BUILD=1
ARG GO_TAGS
Expand Down
4 changes: 2 additions & 2 deletions docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ docs: check-cloudwatch-integration
endif

check-cloudwatch-integration:
$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.22.7-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md
$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.23.3-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md

generate-cloudwatch-integration:
$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.22.7-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate
$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.23.3-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate
2 changes: 1 addition & 1 deletion example/images/grizzly/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM golang:1.22-alpine
FROM golang:1.23-alpine

RUN go install github.com/grafana/grizzly/cmd/[email protected]
2 changes: 1 addition & 1 deletion example/images/jb/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM golang:1.22-alpine
FROM golang:1.23-alpine

RUN go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/[email protected]
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/grafana/alloy

go 1.22.7
go 1.23.3

require (
cloud.google.com/go/pubsub v1.40.0
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/integration-tests/configs/kafka/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.7 as build
FROM golang:1.23.3 as build
WORKDIR /app/
COPY go.mod go.sum ./
COPY syntax/go.mod syntax/go.sum ./syntax/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.7 as build
FROM golang:1.23.3 as build
WORKDIR /app/
COPY go.mod go.sum ./
COPY syntax/go.mod syntax/go.sum ./syntax/
Expand Down
Loading
Loading