Merge pull request #154 from calculi-corp/master

Upgrade to go version 1.18.2 to fix multiple CVEs

Dockerfile.golang

@@ -1,4 +1,4 @@
-ARG GOVERSION=1.14
+ARG GOVERSION=1.18.2
 FROM golang:${GOVERSION}
 
 # Set base env.

Dockerfile.riscv

@@ -1,5 +1,5 @@
-# NOTE: Using 1.13 as a base to build the RISCV compiler, the resulting version is based on go1.6.
-FROM golang:1.13
+# NOTE: Using 1.18.2 as a base to build the RISCV compiler, the resulting version is based on go1.6.
+FROM golang:1.18.2
 
 # Clone and complie a riscv compatible version of the go compiler.
 RUN git clone https://review.gerrithub.io/riscv/riscv-go /riscv-go

go.mod

@@ -1,3 +1,3 @@
 module github.com/creack/pty
 
-go 1.13
+go 1.18

test_crosscompile.sh

@@ -49,12 +49,12 @@ echo2 "Build for linux."
 echo2 "  - linux/riscv"
 docker build -t creack-pty-test -f Dockerfile.riscv .
 
-# Golang dropped support for darwin 32bits since go1.15. Make sure the lib still compile with go1.14 on those archs.
+# Golang dropped support for darwin 32bits since go1.15. Make sure the lib still compile with go1.18.2 on those archs.
 echo2 "Build for darwin (32bits)."
 echo2 "  - darwin/386"
-docker build -t creack-pty-test -f Dockerfile.golang --build-arg=GOVERSION=1.14 --build-arg=GOOS=darwin --build-arg=GOARCH=386 .
+docker build -t creack-pty-test -f Dockerfile.golang --build-arg=GOVERSION=1.18.2 --build-arg=GOOS=darwin --build-arg=GOARCH=386 .
 echo2 "  - darwin/arm"
-docker build -t creack-pty-test -f Dockerfile.golang --build-arg=GOVERSION=1.14 --build-arg=GOOS=darwin --build-arg=GOARCH=arm .
+docker build -t creack-pty-test -f Dockerfile.golang --build-arg=GOVERSION=1.18.2 --build-arg=GOOS=darwin --build-arg=GOARCH=arm .
 
 # Run a single test for an old go version. Would be best with go1.0, but not available on Dockerhub.
 # Using 1.6 as it is the base version for the RISCV compiler.