diff --git a/.github/workflows/environment.yaml b/.github/workflows/environment.yaml index b5c87a24..633ae16d 100644 --- a/.github/workflows/environment.yaml +++ b/.github/workflows/environment.yaml @@ -34,7 +34,7 @@ jobs: - name: setup go uses: actions/setup-go@v5 with: - go-version: 1.22 + go-version: 1.26 - name: Unit test run: | pushd binary/ diff --git a/binary/Makefile b/binary/Makefile index b1efb8ff..fed81432 100644 --- a/binary/Makefile +++ b/binary/Makefile @@ -3,6 +3,6 @@ .PHONY: all all: binary-builder binary-env-img -binary-env-img-buildargs := --build-arg GO_BASE_IMAGE=1.22-alpine --build-arg ALPINE_VERSION=3.20 +binary-env-img-buildargs := --build-arg GO_BASE_IMAGE=1.26-alpine --build-arg ALPINE_VERSION=3.22 binary-env-img: Dockerfile \ No newline at end of file diff --git a/binary/builder/Dockerfile b/binary/builder/Dockerfile index cad81a0b..10c94bb7 100644 --- a/binary/builder/Dockerfile +++ b/binary/builder/Dockerfile @@ -1,7 +1,7 @@ ARG BUILDER_IMAGE=fission/builder:latest FROM ${BUILDER_IMAGE} -FROM alpine:3.20 +FROM alpine:3.22 COPY --from=0 /builder /builder diff --git a/binary/envconfig.json b/binary/envconfig.json index a3d9c3f6..77098908 100644 --- a/binary/envconfig.json +++ b/binary/envconfig.json @@ -18,9 +18,9 @@ ], "name": "Fission Binary Environment", "readme": "https://github.com/fission/environments/tree/master/binary", - "runtimeVersion": "3.20-alpine", + "runtimeVersion": "3.22-alpine", "shortDescription": "Fission environment to run any binary", "status": "Stable", - "version": "1.32.3" + "version": "1.33.0" } ] diff --git a/environments.json b/environments.json index 4f4c3af2..9be8469d 100644 --- a/environments.json +++ b/environments.json @@ -92,16 +92,16 @@ ], "name": "Go Environment", "readme": "https://github.com/fission/environments/tree/master/go", - "runtimeVersion": "1.25", - "shortDescription": "Fission Go 1.25 environment, which uses dynamic loader based on Go plugins.", + "runtimeVersion": "1.26", + "shortDescription": "Fission Go 1.26 environment, which uses dynamic loader based on Go plugins.", "status": "Stable", - "version": "1.33.0" + "version": "1.34.0" }, { - "builder": "go-builder-1.25", + "builder": "go-builder-1.26", "examples": "https://github.com/fission/environments/tree/master/go/examples", "icon": "./logo/go-logo-blue.svg", - "image": "go-env-1.25", + "image": "go-env-1.26", "kind": "environment", "maintainers": [ { @@ -115,10 +115,10 @@ ], "name": "Go Environment", "readme": "https://github.com/fission/environments/tree/master/go", - "runtimeVersion": "1.25", - "shortDescription": "Fission Go 1.25 environment, which uses dynamic loader based on Go plugins.", + "runtimeVersion": "1.26", + "shortDescription": "Fission Go 1.26 environment, which uses dynamic loader based on Go plugins.", "status": "Stable", - "version": "1.33.0" + "version": "1.34.0" } ] , @@ -349,10 +349,10 @@ ], "name": "Fission Binary Environment", "readme": "https://github.com/fission/environments/tree/master/binary", - "runtimeVersion": "3.20-alpine", + "runtimeVersion": "3.22-alpine", "shortDescription": "Fission environment to run any binary", "status": "Stable", - "version": "1.32.3" + "version": "1.33.0" } ] , diff --git a/go/Makefile b/go/Makefile index f61ca764..19d9dd52 100644 --- a/go/Makefile +++ b/go/Makefile @@ -1,12 +1,12 @@ -include ../rules.mk .PHONY: all -all: go-env-img go-env-1.25-img +all: go-env-img go-env-1.26-img -go-env-img-buildargs := --build-arg GO_VERSION=1.25 --build-arg UBUNTU_VERSION=22.04 +go-env-img-buildargs := --build-arg GO_VERSION=1.26 --build-arg UBUNTU_VERSION=22.04 -go-env-1.25-img-buildargs := --build-arg GO_VERSION=1.25 --build-arg UBUNTU_VERSION=22.04 +go-env-1.26-img-buildargs := --build-arg GO_VERSION=1.26 --build-arg UBUNTU_VERSION=22.04 go-env-img: Dockerfile-1.1x -go-env-1.25-img: Dockerfile-1.1x +go-env-1.26-img: Dockerfile-1.1x diff --git a/go/README.md b/go/README.md index c61e9d92..50ce6b26 100644 --- a/go/README.md +++ b/go/README.md @@ -9,14 +9,14 @@ Looking for ready-to-run examples? See the [Go examples directory](../../example ## Build this image ```sh -docker build -t USER/go-env --build-arg GO_VERSION=1.25 --build-arg UBUNTU_VERSION=22.04 -f Dockerfile-1.1x . && docker push USER/go-env +docker build -t USER/go-env --build-arg GO_VERSION=1.26 --build-arg UBUNTU_VERSION=22.04 -f Dockerfile-1.1x . && docker push USER/go-env ``` Note that if you build the runtime, you must also build the go-builder image, to ensure that it's at the same version of go: ```sh -cd builder && docker build -t USER/go-builder --build-arg GO_VERSION=1.25 -f Dockerfile-1.1x . && docker push USER/go-builder +cd builder && docker build -t USER/go-builder --build-arg GO_VERSION=1.26 -f Dockerfile-1.1x . && docker push USER/go-builder ``` ## Using the image in fission diff --git a/go/builder/Makefile b/go/builder/Makefile index 19a43a1b..62ffbe8d 100644 --- a/go/builder/Makefile +++ b/go/builder/Makefile @@ -1,12 +1,12 @@ -include ../../rules.mk .PHONY: all -all: go-builder-img go-builder-1.25-img +all: go-builder-img go-builder-1.26-img -go-builder-img-buildargs := --build-arg GO_VERSION=1.25 +go-builder-img-buildargs := --build-arg GO_VERSION=1.26 -go-builder-1.25-img-buildargs := --build-arg GO_VERSION=1.25 +go-builder-1.26-img-buildargs := --build-arg GO_VERSION=1.26 go-builder-img: Dockerfile-1.1x -go-builder-1.25-img: Dockerfile-1.1x \ No newline at end of file +go-builder-1.26-img: Dockerfile-1.1x \ No newline at end of file diff --git a/go/envconfig.json b/go/envconfig.json index d0add691..7d2d58f4 100644 --- a/go/envconfig.json +++ b/go/envconfig.json @@ -17,16 +17,16 @@ ], "name": "Go Environment", "readme": "https://github.com/fission/environments/tree/master/go", - "runtimeVersion": "1.25", - "shortDescription": "Fission Go 1.25 environment, which uses dynamic loader based on Go plugins.", + "runtimeVersion": "1.26", + "shortDescription": "Fission Go 1.26 environment, which uses dynamic loader based on Go plugins.", "status": "Stable", - "version": "1.33.0" + "version": "1.34.0" }, { - "builder": "go-builder-1.25", + "builder": "go-builder-1.26", "examples": "https://github.com/fission/environments/tree/master/go/examples", "icon": "./logo/go-logo-blue.svg", - "image": "go-env-1.25", + "image": "go-env-1.26", "kind": "environment", "maintainers": [ { @@ -40,9 +40,9 @@ ], "name": "Go Environment", "readme": "https://github.com/fission/environments/tree/master/go", - "runtimeVersion": "1.25", - "shortDescription": "Fission Go 1.25 environment, which uses dynamic loader based on Go plugins.", + "runtimeVersion": "1.26", + "shortDescription": "Fission Go 1.26 environment, which uses dynamic loader based on Go plugins.", "status": "Stable", - "version": "1.33.0" + "version": "1.34.0" } -] \ No newline at end of file +] diff --git a/go/examples/specs/env.yaml b/go/examples/specs/env.yaml index 58168928..513bf645 100644 --- a/go/examples/specs/env.yaml +++ b/go/examples/specs/env.yaml @@ -7,6 +7,6 @@ spec: version: 2 builder: command: build - image: fission/go-builder-1.25:1.33.0 + image: fission/go-builder-1.26:1.34.0 runtime: - image: fission/go-env-1.25:1.33.0 + image: fission/go-env-1.26:1.34.0 diff --git a/skaffold.yaml b/skaffold.yaml index b1f0eb29..18ba480d 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -59,14 +59,14 @@ profiles: docker: dockerfile: Dockerfile-1.1x buildArgs: - GO_VERSION: "1.25" + GO_VERSION: "1.26" UBUNTU_VERSION: "22.04" - image: go-builder context: go/builder/ docker: dockerfile: Dockerfile-1.1x buildArgs: - GO_VERSION: "1.25" + GO_VERSION: "1.26" - name: jvm build: artifacts: @@ -164,8 +164,8 @@ profiles: docker: dockerfile: Dockerfile buildArgs: - GO_BASE_IMAGE: "1.22-alpine" - ALPINE_VERSION: "3.20" + GO_BASE_IMAGE: "1.26-alpine" + ALPINE_VERSION: "3.22" - image: binary-builder context: binary/builder/ docker: