Skip to content

Commit a07a108

Browse files
authored
Merge pull request #44 from credativ/release-2.2.22
Upgrade Alpine to 3.21.3 and Go to 1.24.1
2 parents 21a471a + 4c094f3 commit a07a108

File tree

21 files changed

+36
-31
lines changed

21 files changed

+36
-31
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Set up Go
2424
uses: actions/setup-go@v3
2525
with:
26-
go-version: 1.23.6
26+
go-version: 1.24.1
2727

2828
- name: Install package dependencies
2929
run: |

.github/workflows/unit-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@v3
2222
with:
23-
go-version: 1.23.6
23+
go-version: 1.24.1
2424

2525
- name: Install package dependencies
2626
run: |
@@ -31,7 +31,7 @@ jobs:
3131
run: |
3232
go install github.com/golang/protobuf/protoc-gen-go@v1.3.0
3333
go install github.com/gogo/protobuf/protoc-gen-gogoslick@v1.2.1
34-
go install github.com/fatih/faillint@v1.14.0
34+
go install github.com/fatih/faillint@v1.15.0
3535
3636
- name: Test
3737
run: make BUILD_IN_CONTAINER=false test
@@ -40,7 +40,7 @@ jobs:
4040
run: |
4141
cd /
4242
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \
43-
| sudo sh -s v1.61.0
43+
| sudo sh -s v1.64.7
4444
4545
- name: Run Linter
4646
run: make lint

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 2.2.22 (2025-03-13)
2+
3+
* Upgrade Go to 1.24.1
4+
* Upgrade Alpine to 3.21.3
5+
16
## 2.2.21 (2025-02-06)
27

38
* Upgrade Go to 1.23.6

cmd/docker-driver/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ COPY . /src/vali
99
WORKDIR /src/vali
1010
RUN make clean && make BUILD_IN_CONTAINER=false cmd/docker-driver/docker-driver
1111

12-
FROM alpine:3.21.2
12+
FROM alpine:3.21.3
1313
RUN apk add --update --no-cache ca-certificates tzdata
1414
COPY --from=build /src/vali/cmd/docker-driver/docker-driver /bin/docker-driver
1515
WORKDIR /bin/

cmd/fluent-bit/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23.6 as build
1+
FROM golang:1.24.1 as build
22
COPY . /src/vali
33
WORKDIR /src/vali
44
RUN make clean && make BUILD_IN_CONTAINER=false fluent-bit-plugin

cmd/logcli/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM golang:1.23.6 as build
1+
FROM golang:1.24.1 as build
22

33
ARG TOUCH_PROTOS
44
COPY . /src/vali
55
WORKDIR /src/vali
66
RUN make clean && (if [ "${TOUCH_PROTOS}" ]; then make touch-protos; fi) && make BUILD_IN_CONTAINER=false logcli
77

8-
FROM alpine:3.21.2
8+
FROM alpine:3.21.3
99

1010
RUN apk add --no-cache ca-certificates
1111

cmd/migrate/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM golang:1.23.6 as build
1+
FROM golang:1.24.1 as build
22
COPY . /src/vali
33
WORKDIR /src/vali
44
RUN make clean && make BUILD_IN_CONTAINER=false migrate
55

6-
FROM alpine:3.21.2
6+
FROM alpine:3.21.3
77
RUN apk add --update --no-cache ca-certificates
88
COPY --from=build /src/vali/cmd/migrate/migrate /usr/bin/migrate
99
#ENTRYPOINT [ "/usr/bin/migrate" ]

cmd/querytee/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM golang:1.23.6 as build
1+
FROM golang:1.24.1 as build
22

33
ARG TOUCH_PROTOS
44
COPY . /src/vali
55
WORKDIR /src/vali
66
RUN make clean && make BUILD_IN_CONTAINER=false vali-querytee
77

8-
FROM alpine:3.21.2
8+
FROM alpine:3.21.3
99
RUN apk add --update --no-cache ca-certificates
1010
COPY --from=build /src/vali/cmd/querytee/vali-querytee /usr/bin/querytee
1111
ENTRYPOINT [ "/usr/bin/querytee" ]

cmd/querytee/Dockerfile.cross

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARG BUILD_IMAGE=ghcr.io/credativ/vali-build-image:0.9.1
22
# Directories in this file are referenced from the root of the project not this folder
33
# This file is intended to be called from the root like so:
44
# docker build -t ghcr.io/credativ/valitail -f cmd/valitail/Dockerfile .
5-
FROM golang:1.23.6-alpine as goenv
5+
FROM golang:1.24.1-alpine as goenv
66
RUN go env GOARCH > /goarch && \
77
go env GOARM > /goarm
88

@@ -12,7 +12,7 @@ COPY . /src/vali
1212
WORKDIR /src/vali
1313
RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false vali-querytee
1414

15-
FROM alpine:3.21.2
15+
FROM alpine:3.21.3
1616
RUN apk add --update --no-cache ca-certificates
1717
COPY --from=build /src/vali/cmd/querytee/querytee /usr/bin/querytee
1818
ENTRYPOINT [ "/usr/bin/querytee" ]

cmd/vali-canary/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM golang:1.23.6 as build
1+
FROM golang:1.24.1 as build
22
# TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them.
33
# This is helpful when file system timestamps can't be trusted with make
44
ARG TOUCH_PROTOS
55
COPY . /src/vali
66
WORKDIR /src/vali
77
RUN make clean && (if [ "${TOUCH_PROTOS}" ]; then make touch-protos; fi) && make BUILD_IN_CONTAINER=false vali-canary
88

9-
FROM alpine:3.21.2
9+
FROM alpine:3.21.3
1010
RUN apk add --update --no-cache ca-certificates
1111
COPY --from=build /src/vali/cmd/vali-canary/vali-canary /usr/bin/vali-canary
1212
ENTRYPOINT [ "/usr/bin/vali-canary" ]

0 commit comments

Comments
 (0)