Upgrade Alpine to 3.21.2 and Go to 1.23.6 (#43)

cd-jbl · web-flow · commit 21a471aaf250 · 2025-02-06T10:55:11.000+01:00
* update artifact action to v4
* change runner to ubuntu-22.04
diff --git a/.github/workflows/container-image.yml b/.github/workflows/container-image.yml
@@ -13,7 +13,7 @@ env:
 
 jobs:
   build-and-push-vali:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
       packages: write
@@ -55,7 +55,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
 
   build-and-push-valitail:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
       packages: write
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   logcli:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
     strategy:
@@ -23,7 +23,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.23.4
+          go-version: 1.23.6
 
       - name: Install package dependencies
         run: |
@@ -47,14 +47,14 @@ jobs:
         run: zip --junk-paths logcli_${{ matrix.arch }}.zip cmd/logcli/logcli
 
       - name: Upload logcli as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: logcli_${{ matrix.arch }}
           path: logcli_${{ matrix.arch }}.zip
           retention-days: 3
 
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: logcli
     if: startsWith(github.event.ref, 'refs/tags/v')
     permissions:
@@ -64,7 +64,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Download build artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
 
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   unit-test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
     steps:
@@ -20,7 +20,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.23.4
+          go-version: 1.23.6
 
       - name: Install package dependencies
         run: |
diff --git a/.github/workflows/vali-build-image.yml b/.github/workflows/vali-build-image.yml
@@ -13,7 +13,7 @@ env:
 
 jobs:
   build-and-push-vali-build-image:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
       packages: write
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.2.21 (2025-02-06)
+
+* Upgrade Go to 1.23.6
+* Upgrade Alpine to 3.21.2
+
 ## 2.2.20 (2024-12-06)
 
 * Upgrade Go to 1.23.4
diff --git a/cmd/docker-driver/Dockerfile b/cmd/docker-driver/Dockerfile
@@ -9,7 +9,7 @@ COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && make BUILD_IN_CONTAINER=false cmd/docker-driver/docker-driver
 
-FROM alpine:3.21.0
+FROM alpine:3.21.2
 RUN apk add --update --no-cache ca-certificates tzdata
 COPY --from=build /src/vali/cmd/docker-driver/docker-driver /bin/docker-driver
 WORKDIR /bin/
diff --git a/cmd/fluent-bit/Dockerfile b/cmd/fluent-bit/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.4 as build
+FROM golang:1.23.6 as build
 COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && make BUILD_IN_CONTAINER=false fluent-bit-plugin
diff --git a/cmd/logcli/Dockerfile b/cmd/logcli/Dockerfile
@@ -1,11 +1,11 @@
-FROM golang:1.23.4 as build
+FROM golang:1.23.6 as build
 
 ARG TOUCH_PROTOS
 COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && (if [ "${TOUCH_PROTOS}" ]; then make touch-protos; fi) && make BUILD_IN_CONTAINER=false logcli
 
-FROM alpine:3.21.0
+FROM alpine:3.21.2
 
 RUN apk add --no-cache ca-certificates
 
diff --git a/cmd/migrate/Dockerfile b/cmd/migrate/Dockerfile
@@ -1,9 +1,9 @@
-FROM golang:1.23.4 as build
+FROM golang:1.23.6 as build
 COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && make BUILD_IN_CONTAINER=false migrate
 
-FROM alpine:3.21.0
+FROM alpine:3.21.2
 RUN apk add --update --no-cache ca-certificates
 COPY --from=build /src/vali/cmd/migrate/migrate /usr/bin/migrate
 #ENTRYPOINT [ "/usr/bin/migrate" ]
diff --git a/cmd/querytee/Dockerfile b/cmd/querytee/Dockerfile
@@ -1,11 +1,11 @@
-FROM golang:1.23.4 as build
+FROM golang:1.23.6 as build
 
 ARG TOUCH_PROTOS
 COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && make BUILD_IN_CONTAINER=false vali-querytee
 
-FROM alpine:3.21.0
+FROM alpine:3.21.2
 RUN apk add --update --no-cache ca-certificates
 COPY --from=build /src/vali/cmd/querytee/vali-querytee /usr/bin/querytee
 ENTRYPOINT [ "/usr/bin/querytee" ]
diff --git a/cmd/querytee/Dockerfile.cross b/cmd/querytee/Dockerfile.cross
@@ -2,7 +2,7 @@ ARG BUILD_IMAGE=ghcr.io/credativ/vali-build-image:0.9.1
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t ghcr.io/credativ/valitail -f cmd/valitail/Dockerfile .
-FROM golang:1.23.4-alpine as goenv
+FROM golang:1.23.6-alpine as goenv
 RUN go env GOARCH > /goarch && \
   go env GOARM > /goarm
 
@@ -12,7 +12,7 @@ COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false vali-querytee
 
-FROM alpine:3.21.0
+FROM alpine:3.21.2
 RUN apk add --update --no-cache ca-certificates
 COPY --from=build /src/vali/cmd/querytee/querytee /usr/bin/querytee
 ENTRYPOINT [ "/usr/bin/querytee" ]
diff --git a/cmd/vali-canary/Dockerfile b/cmd/vali-canary/Dockerfile
@@ -1,12 +1,12 @@
-FROM golang:1.23.4 as build
+FROM golang:1.23.6 as build
 # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them.
 # This is helpful when file system timestamps can't be trusted with make
 ARG TOUCH_PROTOS
 COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && (if [ "${TOUCH_PROTOS}" ]; then make touch-protos; fi) && make BUILD_IN_CONTAINER=false vali-canary
 
-FROM alpine:3.21.0
+FROM alpine:3.21.2
 RUN apk add --update --no-cache ca-certificates
 COPY --from=build /src/vali/cmd/vali-canary/vali-canary /usr/bin/vali-canary
 ENTRYPOINT [ "/usr/bin/vali-canary" ]
diff --git a/cmd/vali-canary/Dockerfile.cross b/cmd/vali-canary/Dockerfile.cross
@@ -2,7 +2,7 @@ ARG BUILD_IMAGE=ghcr.io/credativ/vali-build-image:0.12.0
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t ghcr.io/credativ/valitail -f cmd/valitail/Dockerfile .
-FROM golang:1.23.4-alpine as goenv
+FROM golang:1.23.6-alpine as goenv
 RUN go env GOARCH > /goarch && \
   go env GOARM > /goarm
 
@@ -12,7 +12,7 @@ COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false vali-canary
 
-FROM alpine:3.21.0
+FROM alpine:3.21.2
 RUN apk add --update --no-cache ca-certificates
 COPY --from=build /src/vali/cmd/vali-canary/vali-canary /usr/bin/vali-canary
 ENTRYPOINT [ "/usr/bin/vali-canary" ]
diff --git a/cmd/vali/Dockerfile b/cmd/vali/Dockerfile
@@ -1,12 +1,12 @@
-FROM golang:1.23.4 as build
+FROM golang:1.23.6 as build
 # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them.
 # This is helpful when file system timestamps can't be trusted with make
 ARG TOUCH_PROTOS
 COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && (if [ "${TOUCH_PROTOS}" ]; then make touch-protos; fi) && make BUILD_IN_CONTAINER=false vali
 
-FROM alpine:3.21.0
+FROM alpine:3.21.2
 
 RUN apk add --no-cache ca-certificates libcap
 
diff --git a/cmd/vali/Dockerfile.cross b/cmd/vali/Dockerfile.cross
@@ -2,7 +2,7 @@ ARG BUILD_IMAGE=ghcr.io/credativ/vali-build-image:0.12.0
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t ghcr.io/credativ/vali -f cmd/vali/Dockerfile .
-FROM golang:1.23.4-alpine as goenv
+FROM golang:1.23.6-alpine as goenv
 RUN go env GOARCH > /goarch && \
     go env GOARM > /goarm
 
@@ -12,7 +12,7 @@ COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false vali
 
-FROM alpine:3.21.0
+FROM alpine:3.21.2
 
 RUN apk add --no-cache ca-certificates
 
diff --git a/cmd/vali/Dockerfile.debug b/cmd/vali/Dockerfile.debug
@@ -8,7 +8,7 @@ COPY . /src/vali
 WORKDIR /src/vali
 RUN make clean && make BUILD_IN_CONTAINER=false vali-debug
 
-FROM       alpine:3.21.0
+FROM       alpine:3.21.2
 RUN        apk add --update --no-cache ca-certificates
 COPY       --from=build /src/vali/cmd/vali/vali-debug /usr/bin/vali-debug
 COPY       --from=build /go/bin/dlv /usr/bin/dlv
diff --git a/cmd/valitail/Dockerfile b/cmd/valitail/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.4-bookworm as build
+FROM golang:1.23.6-bookworm as build
 # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them.
 # This is helpful when file system timestamps can't be trusted with make
 ARG TOUCH_PROTOS
diff --git a/cmd/valitail/Dockerfile.arm32 b/cmd/valitail/Dockerfile.arm32
@@ -1,4 +1,4 @@
-FROM golang:1.23.4 as build
+FROM golang:1.23.6 as build
 # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them.
 # This is helpful when file system timestamps can't be trusted with make
 ARG TOUCH_PROTOS
diff --git a/cmd/valitail/Dockerfile.cross b/cmd/valitail/Dockerfile.cross
@@ -2,7 +2,7 @@ ARG BUILD_IMAGE=ghcr.io/credativ/vali-build-image:0.12.0
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t ghcr.io/credativ/valitail -f cmd/valitail/Dockerfile .
-FROM golang:1.23.4-alpine as goenv
+FROM golang:1.23.6-alpine as goenv
 RUN go env GOARCH > /goarch && \
   go env GOARM > /goarm
 
diff --git a/cmd/valitail/Dockerfile.debug b/cmd/valitail/Dockerfile.debug
@@ -9,7 +9,7 @@ WORKDIR /src/vali
 RUN make clean && make BUILD_IN_CONTAINER=false valitail-debug
 
 
-FROM       alpine:3.21.0
+FROM       alpine:3.21.2
 RUN        apk add --update --no-cache ca-certificates tzdata
 COPY       --from=build /src/vali/cmd/valitail/valitail-debug /usr/bin/valitail-debug
 COPY       --from=build /go/bin/dlv /usr/bin/dlv
diff --git a/vali-build-image/Dockerfile b/vali-build-image/Dockerfile
@@ -20,10 +20,10 @@ RUN apk add --no-cache docker-cli
 # Error:
 #	github.com/fatih/faillint@v1.5.0 requires golang.org/x/tools@v0.0.0-20200207224406-61798d64f025
 #   (not golang.org/x/tools@v0.0.0-20190918214920-58d531046acd from golang.org/x/tools/cmd/goyacc@58d531046acdc757f177387bc1725bfa79895d69)
-FROM docker.io/library/golang:1.23.4 as faillint
+FROM docker.io/library/golang:1.23.6 as faillint
 RUN go install github.com/fatih/faillint@v1.14.0
 
-FROM docker.io/library/golang:1.23.4-bookworm
+FROM docker.io/library/golang:1.23.6-bookworm
 RUN apt-get update && \
     apt-get install -qy \
     musl gnupg \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.23.4 as build`
	`1`	`+FROM golang:1.23.6 as build`
`2`	`2`	`COPY . /src/vali`
`3`	`3`	`WORKDIR /src/vali`
`4`	`4`	`RUN make clean && make BUILD_IN_CONTAINER=false fluent-bit-plugin`