Merge pull request #46 from sylabs/master

Merge master to release-3.8

Author: dtrudg

.circleci/config.yml

@@ -12,7 +12,6 @@ linters:
     - gosimple
     - govet
     - ineffassign
-    - maligned
     - misspell
     - nakedret
     # we would like to add these

.golangci.yml

@@ -59,21 +59,18 @@ $ echo 'export GOPATH=${HOME}/go' >> ~/.bashrc && \
 
 This is an optional (but highly recommended!) step. To ensure
 consistency and to catch certain kinds of issues early, we provide a
-configuration file for golangci-lint. Every pull request must pass the
+configuration file for `golangci-lint`. Every pull request must pass the
 checks specified there, and these will be run automatically before
 attempting to merge the code. If you are modifying Singularity and
 contributing your changes to the repository, it's faster to run these
 checks locally before uploading your pull request.
 
-In order to install golangci-lint, you can run:
+In order to download and install the latest version of `golangci-lint`,
+you can run:
 
+```sh
+curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin
 ```
-$ curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh |
-  sh -s -- -b $(go env GOPATH)/bin v1.31.0
-```
-
-This will download and install golangci-lint from its Github releases
-page (using version v1.31.0 at the moment).
 
 ## Clone the repo
 

INSTALL.md

@@ -343,15 +343,15 @@ func checkBuildTarget(path string) error {
 		}
 		if !buildArgs.update && !forceOverwrite {
 
-			question := fmt.Sprintf("Build target '%s' already exists and will be deleted during the build process. Do you want to continue? [N/y]", f.Name())
+			question := fmt.Sprintf("Build target '%s' already exists and will be deleted during the build process. Do you want to continue? [N/y] ", f.Name())
 
 			img, err := image.Init(abspath, false)
 			if err != nil {
 				if err != image.ErrUnknownFormat {
 					return fmt.Errorf("while determining '%s' format: %s", f.Name(), err)
 				}
 				// unknown image file format
-				question = fmt.Sprintf("Build target '%s' may be a definition file or a text/binary file that will be overwritten. Do you still want to overwrite it? [N/y]", f.Name())
+				question = fmt.Sprintf("Build target '%s' may be a definition file or a text/binary file that will be overwritten. Do you still want to overwrite it? [N/y] ", f.Name())
 			} else {
 				img.File.Close()
 			}

cmd/internal/cli/build.go

@@ -11,7 +11,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	auth "github.com/deislabs/oras/pkg/auth/docker"
+	auth "github.com/oras-project/oras-go/pkg/auth/docker"
 	"github.com/sylabs/singularity/internal/pkg/util/user"
 	"github.com/sylabs/singularity/pkg/syfs"
 )

e2e/internal/e2e/dockerhub_auth.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2019,2020 Sylabs Inc. All rights reserved.
+// Copyright (c) 2019-2021 Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE.md file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -7,10 +7,10 @@ package e2e
 
 import (
 	"runtime"
-	"syscall"
 	"testing"
 
 	"github.com/pkg/errors"
+	"golang.org/x/sys/unix"
 )
 
 // Privileged wraps the supplied test function with calls to ensure
@@ -21,21 +21,21 @@ func Privileged(f func(*testing.T)) func(*testing.T) {
 
 		runtime.LockOSThread()
 
-		if err := syscall.Setresuid(0, 0, origUID); err != nil {
+		if err := unix.Setresuid(0, 0, origUID); err != nil {
 			err = errors.Wrap(err, "changing user ID to 0")
 			t.Fatalf("privileges escalation failed: %+v", err)
 		}
-		if err := syscall.Setresgid(0, 0, origGID); err != nil {
+		if err := unix.Setresgid(0, 0, origGID); err != nil {
 			err = errors.Wrap(err, "changing group ID to 0")
 			t.Fatalf("privileges escalation failed: %+v", err)
 		}
 
 		defer func() {
-			if err := syscall.Setresgid(origGID, origGID, 0); err != nil {
+			if err := unix.Setresgid(origGID, origGID, 0); err != nil {
 				err = errors.Wrapf(err, "changing group ID to %d", origUID)
 				t.Fatalf("privileges drop failed: %+v", err)
 			}
-			if err := syscall.Setresuid(origUID, origUID, 0); err != nil {
+			if err := unix.Setresuid(origUID, origUID, 0); err != nil {
 				err = errors.Wrapf(err, "changing group ID to %d", origGID)
 				t.Fatalf("privileges drop failed: %+v", err)
 			}

e2e/internal/e2e/priv_linux.go

@@ -17,10 +17,10 @@ import (
 
 	"github.com/containerd/containerd/reference"
 	"github.com/containerd/containerd/remotes/docker"
-	"github.com/deislabs/oras/pkg/content"
-	"github.com/deislabs/oras/pkg/context"
-	"github.com/deislabs/oras/pkg/oras"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
+	"github.com/oras-project/oras-go/pkg/content"
+	"github.com/oras-project/oras-go/pkg/context"
+	"github.com/oras-project/oras-go/pkg/oras"
 	"github.com/pkg/errors"
 	"github.com/sylabs/singularity/e2e/internal/e2e"
 	"github.com/sylabs/singularity/e2e/internal/testhelper"

e2e/pull/pull.go

@@ -3,7 +3,7 @@ module github.com/sylabs/singularity/cli-example-plugin
 go 1.13
 
 require (
-	github.com/spf13/cobra v1.0.0
+	github.com/spf13/cobra v1.1.3
 	github.com/sylabs/singularity v0.0.0
 )