Skip to content

Commit 745e55d

Browse files
maintenance (upgrade): go 1.24
1 parent 2dd23cf commit 745e55d

File tree

3 files changed

+6
-17
lines changed

3 files changed

+6
-17
lines changed

Jenkinsfile

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pipeline {
2727
sh "npm install"
2828
sh "make build_frontend"
2929
}
30-
docker.image("golang:1.23-bookworm").inside("--user=root") {
30+
docker.image("golang:1.24-bookworm").inside("--user=root") {
3131
// prepare: todo - statically compile plg_image_c so we don't have to do this to pass the e2e tests
3232
sh "sed -i 's|plg_image_c|plg_image_golang|' server/plugin/index.go"
3333
// build
@@ -42,7 +42,7 @@ pipeline {
4242
steps {
4343
script {
4444
// smoke test
45-
docker.image("golang:1.23-bookworm").inside("--user=root") {
45+
docker.image("golang:1.24-bookworm").inside("--user=root") {
4646
sh 'timeout 5 ./dist/filestash > access.log || code=$?; if [ $code -ne 124 ]; then exit $code; fi'
4747
sh "cat access.log"
4848
sh "cat access.log | grep -q \"\\[http\\] starting\""
@@ -62,7 +62,7 @@ pipeline {
6262
// sh "cd public && npm run test"
6363
}
6464
// test backend
65-
docker.image("golang:1.23-bookworm").inside("--user=root") {
65+
docker.image("golang:1.24-bookworm").inside("--user=root") {
6666
sh "cp ./test/assets/* /tmp/"
6767
sh "go generate ./test/unit_go/..."
6868
sh "go get ./..."
@@ -82,18 +82,7 @@ pipeline {
8282

8383
stage("Release") {
8484
steps {
85-
// amd64
86-
sh "docker build --no-cache -t machines/filestash:latest-amd64 ./docker/"
87-
sh "docker push machines/filestash:latest-amd64"
88-
89-
// // arm
90-
// sh "docker buildx build --platform linux/arm64 -t machines/filestash:latest-arm64 ./docker/"
91-
92-
// create final image
93-
sh "docker manifest rm machines/filestash:latest || true"
94-
// sh "docker manifest create machines/filestash:latest --amend machines/filestash:latest-amd64 --amend machines/filestash:latest-arm64v8"
95-
sh "docker manifest create machines/filestash:latest --amend machines/filestash:latest-amd64"
96-
sh "docker manifest push machines/filestash:latest"
85+
docker buildx build --platform linux/amd64,linux/arm64 -t machines/filestash:latest --push ./docker/
9786
}
9887
}
9988
}

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN apk add make git gzip brotli && \
1414
make build_frontend
1515

1616
# STEP3: BUILD BACKEND
17-
FROM golang:1.23-bookworm AS builder_backend
17+
FROM golang:1.24-bookworm AS builder_backend
1818
WORKDIR /home/filestash/
1919
COPY --from=builder_frontend /home/filestash/ .
2020
RUN apt-get update > /dev/null && \

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/mickael-kerjean/filestash
22

3-
go 1.23.0
3+
go 1.24.0
44

55
require (
66
cloud.google.com/go/storage v1.48.0

0 commit comments

Comments
 (0)