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.

Sign up for GitHub

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 and update changelog #799

Merged
merged 4 commits into from
May 8, 2024
Merged

Update build image and update changelog #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5511e42
Update build image to v0.1.1
kminehart May 8, 2024
4389655
Update changelog
kminehart May 8, 2024
130e021
Update changelog
kminehart May 8, 2024
b439984
Update docker image bases and regenerate .drone.yml
kminehart May 8, 2024
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
58 changes: 29 additions & 29 deletions .drone/drone.yml
View file
Open in desktop
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.0
image: grafana/alloy-build-image:v0.1.1
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.0
image: grafana/alloy-build-image:v0.1.1
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.0
image: grafana/alloy-build-image:v0.1.1
name: Run Go tests
volumes:
- name: docker
Expand All @@ -163,7 +163,7 @@ platform:
steps:
- commands:
- go test -tags="nodocker,nonetwork" ./...
image: grafana/alloy-build-image:v0.1.0-windows
image: grafana/alloy-build-image:v0.1.1-windows
name: Run Go tests
trigger:
ref:
Expand All @@ -178,7 +178,7 @@ platform:
steps:
- commands:
- make alloy-image
image: grafana/alloy-build-image:v0.1.0
image: grafana/alloy-build-image:v0.1.1
name: Build container
volumes:
- name: docker
Expand All @@ -204,7 +204,7 @@ platform:
steps:
- commands:
- '& "C:/Program Files/git/bin/bash.exe" -c "make alloy-image-windows"'
image: grafana/alloy-build-image:v0.1.0-windows
image: grafana/alloy-build-image:v0.1.1-windows
name: Build container
volumes:
- name: docker
Expand All @@ -231,7 +231,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.0
image: grafana/alloy-build-image:v0.1.1
name: Build
trigger:
event:
Expand All @@ -248,7 +248,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.0
image: grafana/alloy-build-image:v0.1.1
name: Build
trigger:
event:
Expand All @@ -265,7 +265,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.0
image: grafana/alloy-build-image:v0.1.1
name: Build
trigger:
event:
Expand All @@ -282,7 +282,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.0
image: grafana/alloy-build-image:v0.1.1
name: Build
trigger:
event:
Expand All @@ -298,7 +298,7 @@ steps:
- commands:
- make generate-ui
- GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make alloy
image: grafana/alloy-build-image:v0.1.0
image: grafana/alloy-build-image:v0.1.1
name: Build
trigger:
event:
Expand All @@ -314,7 +314,7 @@ steps:
- commands:
- make generate-ui
- GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make alloy
image: grafana/alloy-build-image:v0.1.0
image: grafana/alloy-build-image:v0.1.1
name: Build
trigger:
event:
Expand All @@ -330,7 +330,7 @@ steps:
- commands:
- make generate-ui
- GO_TAGS="builtinassets" GOOS=windows GOARCH=amd64 GOARM= make alloy
image: grafana/alloy-build-image:v0.1.0
image: grafana/alloy-build-image:v0.1.1
name: Build
trigger:
event:
Expand All @@ -346,7 +346,7 @@ steps:
- commands:
- make generate-ui
- GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make alloy
image: grafana/alloy-build-image:v0.1.0
image: grafana/alloy-build-image:v0.1.1
name: Build
trigger:
event:
Expand All @@ -362,7 +362,7 @@ steps:
- commands:
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
failure: ignore
image: grafana/alloy-build-image:v0.1.0
image: grafana/alloy-build-image:v0.1.1
name: Configure QEMU
volumes:
- name: docker
Expand All @@ -382,7 +382,7 @@ steps:
from_secret: docker_password
GCR_CREDS:
from_secret: gcr_admin
image: grafana/alloy-build-image:v0.1.0
image: grafana/alloy-build-image:v0.1.1
name: Publish container
volumes:
- name: docker
Expand All @@ -405,7 +405,7 @@ steps:
- commands:
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
failure: ignore
image: grafana/alloy-build-image:v0.1.0
image: grafana/alloy-build-image:v0.1.1
name: Configure QEMU
volumes:
- name: docker
Expand All @@ -425,7 +425,7 @@ steps:
from_secret: docker_password
GCR_CREDS:
from_secret: gcr_admin
image: grafana/alloy-build-image:v0.1.0
image: grafana/alloy-build-image:v0.1.1
name: Publish container
volumes:
- name: docker
Expand Down Expand Up @@ -459,7 +459,7 @@ steps:
from_secret: docker_password
GCR_CREDS:
from_secret: gcr_admin
image: grafana/alloy-build-image:v0.1.0-windows
image: grafana/alloy-build-image:v0.1.1-windows
name: Build containers
volumes:
- name: docker
Expand Down Expand Up @@ -493,7 +493,7 @@ steps:
from_secret: docker_password
GCR_CREDS:
from_secret: gcr_admin
image: grafana/alloy-build-image:v0.1.0-windows
image: grafana/alloy-build-image:v0.1.1-windows
name: Build containers
volumes:
- name: docker
Expand All @@ -516,7 +516,7 @@ steps:
- commands:
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
failure: ignore
image: grafana/alloy-build-image:v0.1.0
image: grafana/alloy-build-image:v0.1.1
name: Configure QEMU
volumes:
- name: docker
Expand All @@ -536,7 +536,7 @@ steps:
from_secret: docker_password
GCR_CREDS:
from_secret: gcr_admin
image: grafana/alloy-build-image:v0.1.0
image: grafana/alloy-build-image:v0.1.1
name: Publish container
volumes:
- name: docker
Expand All @@ -559,7 +559,7 @@ steps:
- commands:
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
failure: ignore
image: grafana/alloy-build-image:v0.1.0
image: grafana/alloy-build-image:v0.1.1
name: Configure QEMU
volumes:
- name: docker
Expand All @@ -579,7 +579,7 @@ steps:
from_secret: docker_password
GCR_CREDS:
from_secret: gcr_admin
image: grafana/alloy-build-image:v0.1.0
image: grafana/alloy-build-image:v0.1.1
name: Publish container
volumes:
- name: docker
Expand Down Expand Up @@ -613,7 +613,7 @@ steps:
from_secret: docker_password
GCR_CREDS:
from_secret: gcr_admin
image: grafana/alloy-build-image:v0.1.0-windows
image: grafana/alloy-build-image:v0.1.1-windows
name: Build containers
volumes:
- name: docker
Expand Down Expand Up @@ -647,7 +647,7 @@ steps:
from_secret: docker_password
GCR_CREDS:
from_secret: gcr_admin
image: grafana/alloy-build-image:v0.1.0-windows
image: grafana/alloy-build-image:v0.1.1-windows
name: Build containers
volumes:
- name: docker
Expand Down Expand Up @@ -749,7 +749,7 @@ steps:
from_secret: gpg_private_key
GPG_PUBLIC_KEY:
from_secret: gpg_public_key
image: grafana/alloy-build-image:v0.1.0
image: grafana/alloy-build-image:v0.1.1
name: Publish release
volumes:
- name: docker
Expand All @@ -772,7 +772,7 @@ steps:
- commands:
- DOCKER_OPTS="" make dist/alloy-linux-amd64
- DOCKER_OPTS="" make test-packages
image: grafana/alloy-build-image:v0.1.0
image: grafana/alloy-build-image:v0.1.1
name: Test Linux system packages
volumes:
- name: docker
Expand Down Expand Up @@ -870,6 +870,6 @@ kind: secret
name: updater_private_key
---
kind: signature
hmac: 90256fa94151ede8f87febe3f321163c743775ccef301a37bec5a8a7ca5376f9
hmac: 014e46cefcbc28d6d6b5221c2bb477dd9f48bfb6c2fbbf0344e1d1ffef458ca4

...
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ v1.1.0-rc.0
- `otelcol.processor.resourcedetection`: Update to ec2 scraper so that core attributes are not dropped if describeTags returns an error (likely due to permissions).
https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/30672

- Use Go 1.22.3 for builds. (@kminehart)

v1.0.0
------

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
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.0 as build
FROM --platform=$BUILDPLATFORM grafana/alloy-build-image:v0.1.1 as build
ARG BUILDPLATFORM
ARG TARGETPLATFORM
ARG TARGETOS
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.windows
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM grafana/alloy-build-image:v0.1.0-windows as builder
FROM grafana/alloy-build-image:v0.1.1-windows as builder
ARG VERSION
ARG RELEASE_BUILD=1
ARG GO_TAGS
Expand Down
2 changes: 1 addition & 1 deletion tools/make/build-container.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
# variable names should be passed through to the container.

USE_CONTAINER ?= 0
BUILD_IMAGE_VERSION ?= v0.1.0
BUILD_IMAGE_VERSION ?= v0.1.1
kminehart marked this conversation as resolved.
Show resolved Hide resolved
BUILD_IMAGE ?= grafana/alloy-build-image:$(BUILD_IMAGE_VERSION)
DOCKER_OPTS ?= -it

Expand Down
Loading