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
4 changes: 2 additions & 2 deletions .github/workflows/license.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
name: License
runs-on: ubuntu-22.04
steps:
- name: Set up Go 1.23
- name: Set up Go 1.24
uses: actions/setup-go@v3
with:
go-version: 1.23
go-version: 1.24.11
- name: Checkout repo
uses: actions/checkout@v3
- name: Check Eclipse license headers
Expand Down
4 changes: 2 additions & 2 deletions api/jsonrpc/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func jsonRpcCreateExec(tunnel *jsonrpc.Tunnel, params interface{}, t jsonrpc.Res
machineExec := params.(*model.MachineExec)
err := setToken(tunnel, machineExec)
if err != nil {
logrus.Errorf(err.Error())
logrus.Errorf("%s", err.Error())
t.SendError(jsonrpc.NewArgsError(err))
return
}
Expand Down Expand Up @@ -107,7 +107,7 @@ func jsonRpcListContainersExec(tunnel *jsonrpc.Tunnel, _ interface{}, t jsonrpc.
machineExec := &model.MachineExec{}
err := setToken(tunnel, machineExec)
if err != nil {
logrus.Errorf(err.Error())
logrus.Errorf("%s", err.Error())
t.SendError(jsonrpc.NewArgsError(err))
return
}
Expand Down
2 changes: 1 addition & 1 deletion build/dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# Dockerfile defines che-machine-exec production image eclipse/che-machine-exec-dev
#

FROM docker.io/golang:1.23.8-alpine as go_builder
FROM docker.io/golang:1.24.11-alpine as go_builder

ENV USER=machine-exec
ENV UID=12345
Expand Down
14 changes: 6 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/eclipse-che/che-machine-exec

go 1.23.0

toolchain go1.23.8
go 1.24.11

replace (
cloud.google.com/go => cloud.google.com/go v0.54.0
Expand Down Expand Up @@ -165,14 +163,14 @@ replace (

require (
github.com/eclipse/che-go-jsonrpc v0.0.0-20200317130110-931966b891fe
github.com/gin-gonic/gin v1.10.0
github.com/gin-gonic/gin v1.11.0
github.com/gorilla/websocket v1.5.3
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.9.0
github.com/sirupsen/logrus v1.9.4
github.com/stretchr/testify v1.11.1
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.31.1
k8s.io/apimachinery v0.31.1
k8s.io/api v0.35.0
k8s.io/apimachinery v0.35.0
k8s.io/client-go v1.5.2
)

Expand Down
10 changes: 5 additions & 5 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ github.com/eclipse/che-go-jsonrpc/jsonrpcws
# github.com/gin-contrib/sse v0.1.0 => github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7
## explicit
github.com/gin-contrib/sse
# github.com/gin-gonic/gin v1.10.0 => github.com/gin-gonic/gin v1.8.2
# github.com/gin-gonic/gin v1.11.0 => github.com/gin-gonic/gin v1.8.2
## explicit; go 1.18
github.com/gin-gonic/gin
github.com/gin-gonic/gin/binding
Expand Down Expand Up @@ -105,13 +105,13 @@ github.com/pkg/errors
# github.com/pmezard/go-difflib v1.0.0 => github.com/pmezard/go-difflib v1.0.0
## explicit
github.com/pmezard/go-difflib/difflib
# github.com/sirupsen/logrus v1.9.3 => github.com/sirupsen/logrus v1.4.2
# github.com/sirupsen/logrus v1.9.4 => github.com/sirupsen/logrus v1.4.2
## explicit
github.com/sirupsen/logrus
# github.com/stretchr/objx v0.2.0 => github.com/stretchr/objx v0.3.0
## explicit; go 1.12
github.com/stretchr/objx
# github.com/stretchr/testify v1.9.0 => github.com/stretchr/testify v1.4.0
# github.com/stretchr/testify v1.11.1 => github.com/stretchr/testify v1.4.0
## explicit
github.com/stretchr/testify/assert
github.com/stretchr/testify/mock
Expand Down Expand Up @@ -203,7 +203,7 @@ gopkg.in/inf.v0
# gopkg.in/yaml.v2 v2.4.0 => gopkg.in/yaml.v2 v2.4.0
## explicit; go 1.15
gopkg.in/yaml.v2
# k8s.io/api v0.31.1 => k8s.io/api v0.21.0
# k8s.io/api v0.35.0 => k8s.io/api v0.21.0
## explicit; go 1.16
k8s.io/api/admissionregistration/v1
k8s.io/api/admissionregistration/v1beta1
Expand Down Expand Up @@ -248,7 +248,7 @@ k8s.io/api/scheduling/v1beta1
k8s.io/api/storage/v1
k8s.io/api/storage/v1alpha1
k8s.io/api/storage/v1beta1
# k8s.io/apimachinery v0.31.1 => k8s.io/apimachinery v0.21.0
# k8s.io/apimachinery v0.35.0 => k8s.io/apimachinery v0.21.0
## explicit; go 1.16
k8s.io/apimachinery/pkg/api/errors
k8s.io/apimachinery/pkg/api/meta
Expand Down