diff --git a/build/dockerfiles/Dockerfile b/build/dockerfiles/Dockerfile index 3de5918d..6356716a 100644 --- a/build/dockerfiles/Dockerfile +++ b/build/dockerfiles/Dockerfile @@ -12,7 +12,7 @@ # Dockerfile defines che-machine-exec production image eclipse/che-machine-exec-dev # -FROM docker.io/golang:1.19.13-alpine as go_builder +FROM docker.io/golang:1.20.10-alpine as go_builder ENV USER=machine-exec ENV UID=12345 diff --git a/build/dockerfiles/brew.Dockerfile b/build/dockerfiles/brew.Dockerfile index c28769d0..a147640c 100644 --- a/build/dockerfiles/brew.Dockerfile +++ b/build/dockerfiles/brew.Dockerfile @@ -10,7 +10,7 @@ # # https://registry.access.redhat.com/rhel8/go-toolset -FROM rhel8/go-toolset:1.19.13-2 as builder +FROM rhel8/go-toolset:1.20.10-3 as builder ENV GOPATH=/go/ \ CGO_ENABLED=1 USER root @@ -27,7 +27,7 @@ RUN adduser unprivilegeduser && \ cp -rf /che-machine-exec/che-machine-exec /rootfs/go/bin # https://registry.access.redhat.com/ubi8-minimal -FROM registry.access.redhat.com/ubi8-minimal:8.8-1072 as runtime +FROM registry.access.redhat.com/ubi8-minimal:8.9-1029 as runtime COPY --from=builder /rootfs / RUN microdnf install -y openssl; microdnf clean -y all USER unprivilegeduser diff --git a/build/dockerfiles/rhel.Dockerfile b/build/dockerfiles/rhel.Dockerfile index f06dedf8..ea92884c 100644 --- a/build/dockerfiles/rhel.Dockerfile +++ b/build/dockerfiles/rhel.Dockerfile @@ -10,7 +10,7 @@ # # https://registry.access.redhat.com/ubi8/go-toolset -FROM registry.access.redhat.com/ubi8/go-toolset:1.19.13-2 as builder +FROM registry.access.redhat.com/ubi8/go-toolset:1.20.10-3 as builder ENV GOPATH=/go/ \ CGO_ENABLED=1 USER root @@ -27,7 +27,7 @@ RUN adduser unprivilegeduser && \ cp -rf /che-machine-exec/che-machine-exec /rootfs/go/bin # https://registry.access.redhat.com/ubi8-minimal -FROM registry.access.redhat.com/ubi8-minimal:8.8-1072 as runtime +FROM registry.access.redhat.com/ubi8-minimal:8.9-1029 as runtime COPY --from=builder /rootfs / RUN microdnf install -y openssl && \ microdnf -y update && \ diff --git a/go.mod b/go.mod index 428fc276..431fbda5 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/eclipse-che/che-machine-exec -go 1.19 +go 1.20 replace ( cloud.google.com/go => cloud.google.com/go v0.54.0 @@ -169,13 +169,13 @@ replace ( require ( github.com/eclipse/che-go-jsonrpc v0.0.0-20200317130110-931966b891fe github.com/gin-gonic/gin v1.9.1 - github.com/gorilla/websocket v1.5.0 + github.com/gorilla/websocket v1.5.1 github.com/pkg/errors v0.9.1 - github.com/sirupsen/logrus v1.9.0 - github.com/stretchr/testify v1.8.1 + github.com/sirupsen/logrus v1.9.3 + github.com/stretchr/testify v1.8.4 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.26.1 - k8s.io/apimachinery v0.26.1 + k8s.io/api v0.28.4 + k8s.io/apimachinery v0.28.4 k8s.io/client-go v1.5.2 ) diff --git a/vendor/modules.txt b/vendor/modules.txt index 8348710b..3a1d48a2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -67,7 +67,7 @@ github.com/googleapis/gnostic/compiler github.com/googleapis/gnostic/extensions github.com/googleapis/gnostic/jsonschema github.com/googleapis/gnostic/openapiv2 -# github.com/gorilla/websocket v1.5.0 => github.com/gorilla/websocket v1.4.2 +# github.com/gorilla/websocket v1.5.1 => github.com/gorilla/websocket v1.4.2 ## explicit; go 1.12 github.com/gorilla/websocket # github.com/json-iterator/go v1.1.12 => github.com/json-iterator/go v0.0.0-20200608025830-a1ca0830781e @@ -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.0 => github.com/sirupsen/logrus v1.4.2 +# github.com/sirupsen/logrus v1.9.3 => 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.8.1 => github.com/stretchr/testify v1.4.0 +# github.com/stretchr/testify v1.8.4 => github.com/stretchr/testify v1.4.0 ## explicit github.com/stretchr/testify/assert github.com/stretchr/testify/mock @@ -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.26.1 => k8s.io/api v0.21.0 +# k8s.io/api v0.28.4 => k8s.io/api v0.21.0 ## explicit; go 1.16 k8s.io/api/admissionregistration/v1 k8s.io/api/admissionregistration/v1beta1 @@ -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.26.1 => k8s.io/apimachinery v0.21.0 +# k8s.io/apimachinery v0.28.4 => k8s.io/apimachinery v0.21.0 ## explicit; go 1.16 k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/meta