Bump to Golang 1.19

.drone.yml

@@ -8,7 +8,7 @@ platform:
 steps:
 - name: build
   pull: default
-  image: rancher/dapper:v0.4.1
+  image: rancher/dapper:v0.6.0
   commands:
     - dapper ci
   volumes:
@@ -45,7 +45,7 @@ platform:
 steps:
 - name: build
   pull: default
-  image: rancher/dapper:v0.4.1
+  image: rancher/dapper:v0.6.0
   commands:
     - dapper ci
   volumes:
@@ -86,7 +86,7 @@ node:
 steps:
   - name: build
     pull: default
-    image: rancher/dapper:v0.5.8
+    image: rancher/dapper:v0.6.0
     commands:
       - dapper ci
     volumes:

Dockerfile.dapper

@@ -1,31 +1,12 @@
-FROM ubuntu:16.04
-# FROM arm=armhf/ubuntu:16.04
+FROM registry.suse.com/bci/golang:1.19-20.13
 
 ARG DAPPER_HOST_ARCH
 ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH}
 
-RUN apt-get update && \
-    apt-get install -y gcc ca-certificates git wget curl vim less file && \
-    rm -f /bin/sh && ln -s /bin/bash /bin/sh
+RUN zypper -n in docker
 
-ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH_arm64=arm64 GOLANG_ARCH_s390x=s390x GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
-    GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash
-
-RUN wget -O - https://storage.googleapis.com/golang/go1.17.5.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \
-    go get golang.org/x/lint/golint
-
-
-ENV DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 \
-    DOCKER_URL_arm=https://github.com/rancher/docker/releases/download/v1.10.3-ros1/docker-1.10.3_arm \
-    DOCKER_URL_arm64=https://github.com/rancher/docker/releases/download/v1.10.3-ros1/docker-1.10.3_arm64 \
-    DOCKER_URL=DOCKER_URL_${ARCH}
-
-RUN if [ "${ARCH}" == "s390x" ]; then \
-        curl -L https://download.docker.com/linux/static/stable/s390x/docker-18.06.3-ce.tgz | tar xzvf - && \
-        cp docker/docker /usr/bin/ && \
-        chmod +x /usr/bin/docker; \
-    else \
-        wget -O - ${!DOCKER_URL} > /usr/bin/docker && chmod +x /usr/bin/docker; \
+RUN if [ "${ARCH}" == "amd64" ]; then \
+        curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.51.1; \
     fi
 
 ENV DAPPER_ENV REPO TAG

go.mod

@@ -1,6 +1,6 @@
 module loglevel
 
-go 1.17
+go 1.19
 
 require github.com/urfave/cli v1.22.5
 

main.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"os"
@@ -88,13 +87,17 @@ func (client *Client) setLogLevel(level string) error {
 		return err
 	}
 	if response.StatusCode != http.StatusOK {
-		body, err := ioutil.ReadAll(response.Body)
+		body, err := io.ReadAll(response.Body)
 		if err != nil {
 			return err
 		}
 		return errors.New(strings.TrimRight(string(body), "\n"))
 	}
-	io.Copy(os.Stdout, response.Body)
+	_, err = io.Copy(os.Stdout, response.Body)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -103,6 +106,10 @@ func (client *Client) getLogLevel() error {
 	if err != nil {
 		return err
 	}
-	io.Copy(os.Stdout, response.Body)
+	_, err = io.Copy(os.Stdout, response.Body)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }

scripts/validate

@@ -5,16 +5,17 @@ cd $(dirname $0)/..
 
 echo Running validation
 
-PACKAGES=". $(find -name '*.go' | xargs -I{} dirname {} |  cut -f2 -d/ | sort -u | grep -Ev '(^\.$|.git|.trash-cache|vendor|bin)' | sed -e 's!^!./!' -e 's!$!/...!')"
-
-echo Running: go vet
-go vet ${PACKAGES}
-echo Running: golint
-for i in ${PACKAGES}; do
-    if [ -n "$(golint $i | grep -v 'should have comment.*or be unexported' | tee /dev/stderr)" ]; then
-        failed=true
-    fi
-done
-test -z "$failed"
+PACKAGES="$(go list ./...)"
+
 echo Running: go fmt
 test -z "$(go fmt ${PACKAGES} | tee /dev/stderr)"
+
+if ! command -v golangci-lint; then
+    echo "Skipping validation on ARCH's other than linux amd64"
+    exit
+fi
+
+echo Running: golangci-lint
+golangci-lint run
+
+

scripts/version

@@ -1,11 +1,8 @@
 #!/bin/bash
-
 if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
     DIRTY="-dirty"
 fi
 
-git fetch
-
 COMMIT=$(git rev-parse --short HEAD)
 GIT_TAG=$(git tag -l --contains HEAD | head -n 1)