Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion .github/workflows/environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion binary/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion binary/builder/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions binary/envconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
20 changes: 10 additions & 10 deletions environments.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand All @@ -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"
}
]
,
Expand Down Expand Up @@ -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"
}
]
,
Expand Down
8 changes: 4 additions & 4 deletions go/Makefile
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions go/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
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.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
go-builder-1.26-img: Dockerfile-1.1x
18 changes: 9 additions & 9 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.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": [
{
Expand All @@ -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"
}
]
]
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.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
8 changes: 4 additions & 4 deletions skaffold.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Loading