Skip to content

fix: bump alpine version to 3.21 and go version 1.22.12 #167

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

Merged
merged 3 commits into from
Feb 26, 2025
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/release-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.22.8
go-version: 1.22.12
- name: Install msitools
run: sudo apt-get install -y wixl
# More assembly might be required: Docker logins, GPG, etc.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.22.8
go-version: 1.22.12

- name: Install msitools
run: sudo apt-get install -y wixl
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.22.8
go-version: 1.22.12

- name: Install msitools
run: sudo apt-get install -y wixl
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.22.8
go-version: 1.22.12
- name: Install msitools
run: sudo apt-get install -y wixl
- name: Install qemu
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-unit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
test:
strategy:
matrix:
go: [ 1.22.8 ]
go: [ 1.22.12 ]
platform: [ ubuntu-latest ]
runs-on: ${{ matrix.platform }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Code for the Observe agent and CLI. The agent code is based on the OpenTelemetry

# Build

To run the code you need to have `golang v1.22.8` installed. Then you can run the following command to compile the binary.
To run the code you need to have `golang v1.22.12` installed. Then you can run the following command to compile the binary.

```sh
go build -o observe-agent
Expand Down
2 changes: 1 addition & 1 deletion components/processors/observek8sattributesprocessor/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/observeinc/observe-agent/components/processors/observek8sattributesprocessor

go 1.22.8
go 1.22.12

require (
github.com/jmespath/go-jmespath v0.4.0
Expand Down
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/observeinc/observe-agent

go 1.22.8
go 1.22.12

require (
github.com/jarcoal/httpmock v1.3.1
Expand Down
2 changes: 1 addition & 1 deletion go.work
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
go 1.22.8
go 1.22.12

use (
.
Expand Down
2 changes: 1 addition & 1 deletion internal/tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module observe-agent/internal/tools

go 1.22.8
go 1.22.12

require (
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion observecol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module github.com/observeinc/observe-agent/observecol

go 1.22.8
go 1.22.12

require (
github.com/observeinc/observe-agent v0.0.0-00010101000000-000000000000
Expand Down
6 changes: 3 additions & 3 deletions packaging/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ RUN tar czhf observe-agent.tar.gz /observe-agent $(ldd /observe-agent | grep -oP
# however, we can copy full directory as root (/) to be base file structure for scratch image
RUN mkdir /output && tar xf /observe-agent.tar.gz --directory /output

FROM alpine:3.20.3 AS directories
FROM alpine:3.21.3 AS directories
RUN mkdir -p /var/lib/observe-agent/filestorage

FROM alpine:3.20.3 AS certs
FROM alpine:3.21.3 AS certs
RUN apk --update add ca-certificates

FROM debian:12.5 AS systemd
Expand All @@ -28,7 +28,7 @@ RUN tar czhf journalctl.tar.gz /bin/journalctl $(ldd /bin/journalctl | grep -oP
# however, we can copy full directory as root (/) to be base file structure for scratch image
RUN mkdir /output && tar xf /journalctl.tar.gz --directory /output

FROM alpine:3.20.3
FROM alpine:3.21.3
ADD packaging/docker/observe-agent /etc/observe-agent
COPY --from=systemd /output/ /
COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
Expand Down
6 changes: 3 additions & 3 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -838,11 +838,11 @@ github.com/munnerz/goautoneg
## explicit
github.com/mwitkow/go-conntrack
# github.com/observeinc/observe-agent v0.0.0-00010101000000-000000000000 => .
## explicit; go 1.22.8
## explicit; go 1.22.12
# github.com/observeinc/observe-agent/components/processors/observek8sattributesprocessor v0.0.0-00010101000000-000000000000 => ./components/processors/observek8sattributesprocessor
## explicit; go 1.22.8
## explicit; go 1.22.12
# github.com/observeinc/observe-agent/observecol v0.0.0-00010101000000-000000000000 => ./observecol
## explicit; go 1.22.8
## explicit; go 1.22.12
# github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.118.0
## explicit; go 1.22.0
github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector
Expand Down
Loading