diff --git a/.tekton/entitlements-api-go-pull-request.yaml b/.tekton/entitlements-api-go-pull-request.yaml index ed61567..c59c7fd 100644 --- a/.tekton/entitlements-api-go-pull-request.yaml +++ b/.tekton/entitlements-api-go-pull-request.yaml @@ -222,7 +222,7 @@ spec: # set the working directory to value from previous step workingDir: /var/workdir/source # Use image that suites your use case - image: registry.access.redhat.com/ubi8/go-toolset:1.21.13 + image: registry.access.redhat.com/ubi8/go-toolset:1.22.7 securityContext: # If the task step needs write access to the volume, set the runAsUser to 0 (root). runAsUser: 0 diff --git a/Dockerfile b/Dockerfile index 5dadf66..f7826cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,8 @@ # Manual Build: YYYY-MM-DD # Use go-toolset as the builder image # Once built, copys GO executable to a smaller image and runs it from there -# FROM registry.redhat.io/ubi8/go-toolset as builder -#FROM quay.io/projectquay/golang:1.20 as builder -FROM registry.access.redhat.com/ubi8/go-toolset:1.21.13 as builder +FROM registry.access.redhat.com/ubi8/go-toolset:1.22.7 as builder WORKDIR /go/src/app diff --git a/README.md b/README.md index 6c68248..17499a2 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ make If your local version differs from what entitlements is using, you can download the desired version of go here: [go.dev/doc/manage-install](https://go.dev/doc/manage-install), and then pass the path to the go binary to all make commands like so: ```sh -make GO=~/go/bin/go1.20 +make GO=~/go/bin/go1.22 ``` ## Certificates and Configuration diff --git a/go.mod b/go.mod index 7a0d230..6090aed 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/RedHatInsights/entitlements-api-go -go 1.21 +go 1.22 require ( github.com/766b/chi-logger v0.0.0-20180309043024-d2679d398ce4 diff --git a/pr_check.sh b/pr_check.sh index b3a2106..4235677 100755 --- a/pr_check.sh +++ b/pr_check.sh @@ -7,7 +7,7 @@ export APP_NAME="entitlements" # name of app-sre "application" folder this comp export COMPONENT_NAME="entitlements-api-go" # name of app-sre "resourceTemplate" in deploy.yaml for this component export IMAGE="quay.io/cloudservices/entitlements-api-go" # the image location on quay -export GOROOT="/opt/go/1.20.10" +export GOROOT="/opt/go/1.22.5" export PATH="${GOROOT}/bin:${PATH}" echo "*** GO version ***"