Skip to content

Commit b22ac45

Browse files
authored
Update Go env version to 1.25 (#435)
* Update Go env version to 1.25 Signed-off-by: Sanket Sudake <sanketsudake@gmail.com> * Update go version in skaffold Signed-off-by: Sanket Sudake <sanketsudake@gmail.com> --------- Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
1 parent 2349b43 commit b22ac45

File tree

7 files changed

+23
-24
lines changed

7 files changed

+23
-24
lines changed

go/Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
-include ../rules.mk
22

33
.PHONY: all
4-
all: go-env-img go-env-1.23-img
4+
all: go-env-img go-env-1.25-img
55

6-
go-env-img-buildargs := --build-arg GO_VERSION=1.22 --build-arg UBUNTU_VERSION=22.04
6+
go-env-img-buildargs := --build-arg GO_VERSION=1.25 --build-arg UBUNTU_VERSION=22.04
77

8-
go-env-1.23-img-buildargs := --build-arg GO_VERSION=1.23 --build-arg UBUNTU_VERSION=22.04
8+
go-env-1.25-img-buildargs := --build-arg GO_VERSION=1.25 --build-arg UBUNTU_VERSION=22.04
99

1010
go-env-img: Dockerfile-1.1x
1111

12-
go-env-1.23-img: Dockerfile-1.1x
13-
12+
go-env-1.25-img: Dockerfile-1.1x

go/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ Looking for ready-to-run examples? See the [Go examples directory](../../example
99
## Build this image
1010

1111
```sh
12-
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
12+
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
1313
```
1414

1515
Note that if you build the runtime, you must also build the go-builder
1616
image, to ensure that it's at the same version of go:
1717

1818
```sh
19-
cd builder && docker build -t USER/go-builder --build-arg GO_VERSION=1.16 -f Dockerfile-1.1x . && docker push USER/go-builder
19+
cd builder && docker build -t USER/go-builder --build-arg GO_VERSION=1.25 -f Dockerfile-1.1x . && docker push USER/go-builder
2020
```
2121

2222
## Using the image in fission

go/builder/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
-include ../../rules.mk
22

33
.PHONY: all
4-
all: go-builder-img go-builder-1.23-img
4+
all: go-builder-img go-builder-1.25-img
55

6-
go-builder-img-buildargs := --build-arg GO_VERSION=1.22
6+
go-builder-img-buildargs := --build-arg GO_VERSION=1.25
77

8-
go-builder-1.23-img-buildargs := --build-arg GO_VERSION=1.23
8+
go-builder-1.25-img-buildargs := --build-arg GO_VERSION=1.25
99

1010
go-builder-img: Dockerfile-1.1x
1111

12-
go-builder-1.23-img: Dockerfile-1.1x
12+
go-builder-1.25-img: Dockerfile-1.1x

go/envconfig.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
],
1818
"name": "Go Environment",
1919
"readme": "https://github.com/fission/environments/tree/master/go",
20-
"runtimeVersion": "1.22",
21-
"shortDescription": "Fission Go 1.22 environment, which uses dynamic loader based on Go plugins.",
20+
"runtimeVersion": "1.25",
21+
"shortDescription": "Fission Go 1.25 environment, which uses dynamic loader based on Go plugins.",
2222
"status": "Stable",
23-
"version": "1.32.3"
23+
"version": "1.33.0"
2424
},
2525
{
26-
"builder": "go-builder-1.23",
26+
"builder": "go-builder-1.25",
2727
"examples": "https://github.com/fission/environments/tree/master/go/examples",
2828
"icon": "./logo/go-logo-blue.svg",
29-
"image": "go-env-1.23",
29+
"image": "go-env-1.25",
3030
"kind": "environment",
3131
"maintainers": [
3232
{
@@ -40,9 +40,9 @@
4040
],
4141
"name": "Go Environment",
4242
"readme": "https://github.com/fission/environments/tree/master/go",
43-
"runtimeVersion": "1.23",
44-
"shortDescription": "Fission Go 1.23 environment, which uses dynamic loader based on Go plugins.",
43+
"runtimeVersion": "1.25",
44+
"shortDescription": "Fission Go 1.25 environment, which uses dynamic loader based on Go plugins.",
4545
"status": "Stable",
46-
"version": "1.32.3"
46+
"version": "1.33.0"
4747
}
4848
]

go/examples/module-example/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module github.com/fission/environments/go/examples/module-example
22

3-
go 1.22
3+
go 1.25
44

55
require golang.org/x/example v0.0.0-20210811190340-787a929d5a0d

go/examples/specs/env.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ spec:
77
version: 2
88
builder:
99
command: build
10-
image: fission/go-builder-1.12:1.5.0
10+
image: fission/go-builder-1.25:1.33.0
1111
runtime:
12-
image: fission/go-env-1.12:1.5.0
12+
image: fission/go-env-1.25:1.33.0

skaffold.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ profiles:
5959
docker:
6060
dockerfile: Dockerfile-1.1x
6161
buildArgs:
62-
GO_VERSION: "1.22"
62+
GO_VERSION: "1.25"
6363
UBUNTU_VERSION: "22.04"
6464
- image: go-builder
6565
context: go/builder/
6666
docker:
6767
dockerfile: Dockerfile-1.1x
6868
buildArgs:
69-
GO_VERSION: "1.22"
69+
GO_VERSION: "1.25"
7070
- name: jvm
7171
build:
7272
artifacts:

0 commit comments

Comments
 (0)