Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions go/Makefile
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions go/builder/Makefile
Original file line number Diff line number Diff line change
@@ -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
16 changes: 8 additions & 8 deletions go/envconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand All @@ -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"
}
]
2 changes: 1 addition & 1 deletion go/examples/module-example/go.mod
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions go/examples/specs/env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading