diff --git a/go/Makefile b/go/Makefile index 596f6eda..f61ca764 100644 --- a/go/Makefile +++ b/go/Makefile @@ -1,13 +1,12 @@ -include ../rules.mk .PHONY: all -all: go-env-img go-env-1.23-img +all: go-env-img go-env-1.25-img -go-env-img-buildargs := --build-arg GO_VERSION=1.22 --build-arg UBUNTU_VERSION=22.04 +go-env-img-buildargs := --build-arg GO_VERSION=1.25 --build-arg UBUNTU_VERSION=22.04 -go-env-1.23-img-buildargs := --build-arg GO_VERSION=1.23 --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-img: Dockerfile-1.1x -go-env-1.23-img: Dockerfile-1.1x - +go-env-1.25-img: Dockerfile-1.1x diff --git a/go/README.md b/go/README.md index 16a14e19..c61e9d92 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.16 --build-arg UBUNTU_VERSION=20.04 -f Dockerfile-1.1x . && docker push USER/go-env +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 ``` 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.16 -f Dockerfile-1.1x . && docker push USER/go-builder +cd builder && docker build -t USER/go-builder --build-arg GO_VERSION=1.25 -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 1a5260ca..19a43a1b 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.23-img +all: go-builder-img go-builder-1.25-img -go-builder-img-buildargs := --build-arg GO_VERSION=1.22 +go-builder-img-buildargs := --build-arg GO_VERSION=1.25 -go-builder-1.23-img-buildargs := --build-arg GO_VERSION=1.23 +go-builder-1.25-img-buildargs := --build-arg GO_VERSION=1.25 go-builder-img: Dockerfile-1.1x -go-builder-1.23-img: Dockerfile-1.1x +go-builder-1.25-img: Dockerfile-1.1x \ No newline at end of file diff --git a/go/envconfig.json b/go/envconfig.json index 700566b0..d0add691 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.22", - "shortDescription": "Fission Go 1.22 environment, which uses dynamic loader based on Go plugins.", + "runtimeVersion": "1.25", + "shortDescription": "Fission Go 1.25 environment, which uses dynamic loader based on Go plugins.", "status": "Stable", - "version": "1.32.3" + "version": "1.33.0" }, { - "builder": "go-builder-1.23", + "builder": "go-builder-1.25", "examples": "https://github.com/fission/environments/tree/master/go/examples", "icon": "./logo/go-logo-blue.svg", - "image": "go-env-1.23", + "image": "go-env-1.25", "kind": "environment", "maintainers": [ { @@ -40,9 +40,9 @@ ], "name": "Go Environment", "readme": "https://github.com/fission/environments/tree/master/go", - "runtimeVersion": "1.23", - "shortDescription": "Fission Go 1.23 environment, which uses dynamic loader based on Go plugins.", + "runtimeVersion": "1.25", + "shortDescription": "Fission Go 1.25 environment, which uses dynamic loader based on Go plugins.", "status": "Stable", - "version": "1.32.3" + "version": "1.33.0" } ] \ No newline at end of file diff --git a/go/examples/module-example/go.mod b/go/examples/module-example/go.mod index 63a56ed2..8fd9f683 100644 --- a/go/examples/module-example/go.mod +++ b/go/examples/module-example/go.mod @@ -1,5 +1,5 @@ module github.com/fission/environments/go/examples/module-example -go 1.22 +go 1.25 require golang.org/x/example v0.0.0-20210811190340-787a929d5a0d diff --git a/go/examples/specs/env.yaml b/go/examples/specs/env.yaml index c5c9b140..58168928 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.12:1.5.0 + image: fission/go-builder-1.25:1.33.0 runtime: - image: fission/go-env-1.12:1.5.0 + image: fission/go-env-1.25:1.33.0 diff --git a/skaffold.yaml b/skaffold.yaml index e5c169dd..4a7248d6 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -59,14 +59,14 @@ profiles: docker: dockerfile: Dockerfile-1.1x buildArgs: - GO_VERSION: "1.22" + GO_VERSION: "1.25" UBUNTU_VERSION: "22.04" - image: go-builder context: go/builder/ docker: dockerfile: Dockerfile-1.1x buildArgs: - GO_VERSION: "1.22" + GO_VERSION: "1.25" - name: jvm build: artifacts: