Fix for Go 1.16+ & bump to 1.17

Fixes #20

.circleci/config.yml

@@ -51,11 +51,11 @@ jobs:
             apt-get update -y && \
             apt-get install -f -y build-essential libssl-dev uuid-dev squashfs-tools libseccomp-dev cryptsetup-bin libgpgme-dev
       - run:
-          name: Install Go 1.14.11
+          name: Install Go 1.17
           command: |
-            wget https://dl.google.com/go/go1.14.11.linux-amd64.tar.gz
+            wget https://dl.google.com/go/go1.17.linux-amd64.tar.gz
             rm -rf /usr/local/go
-            tar -C /usr/local -xzf go1.14.11.linux-amd64.tar.gz
+            tar -C /usr/local -xzf go1.17.linux-amd64.tar.gz
             ln -s /usr/local/go/bin/go /usr/local/bin/go
       - run:
           name: make html
@@ -83,11 +83,11 @@ jobs:
             apt-get update -y && \
             apt-get install -f -y build-essential libssl-dev uuid-dev squashfs-tools libseccomp-dev cryptsetup-bin libgpgme-dev
       - run:
-          name: Install Go 1.14.11
+          name: Install Go 1.17
           command: |
-            wget https://dl.google.com/go/go1.14.11.linux-amd64.tar.gz
+            wget https://dl.google.com/go/go1.17.linux-amd64.tar.gz
             rm -rf /usr/local/go
-            tar -C /usr/local -xzf go1.14.11.linux-amd64.tar.gz
+            tar -C /usr/local -xzf go1.17.linux-amd64.tar.gz
             ln -s /usr/local/go/bin/go /usr/local/bin/go
       - run:
           name: Install TeXlive

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "vendor/github.com/sylabs/singularity"]
-	path = vendor/src/github.com/sylabs/singularity
+	path = singularity_source
 	url = https://github.com/sylabs/singularity
 	branch = master

Makefile

@@ -9,8 +9,6 @@ BUILDDIR      = _build
 
 # This is a custom target that represents the CLI docs generated from Singularity
 CLIDOCS = cli/singularity.rst
-# This is the full path to the singularity submodule
-SINGULARITY_DIR = $(CURDIR)/vendor/src/github.com/sylabs/singularity
 
 # User-friendly check for sphinx-build
 ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
@@ -55,17 +53,15 @@ ifndef SKIPCLI
 
 clidocs: cli/singularity.rst
 
-vendor/github.com/sylabs/singularity/builddir/singularity:
-	export GOPATH=$$(pwd)/vendor &&\
-	cd $(SINGULARITY_DIR) &&\
-	go mod vendor &&\
+singularity_source/builddir/singularity:
+	cd singularity_source &&\
 	./mconfig &&\
 	cd builddir &&\
 	make
 
-cli/singularity.rst: vendor/github.com/sylabs/singularity/builddir/singularity
-	export GOPATH=$$(pwd)/vendor &&\
-	go run $(SINGULARITY_DIR)/cmd/docs/docs.go rst --dir cli
+cli/singularity.rst: singularity_source/builddir/singularity
+	cd singularity_source &&\
+	go run ./cmd/docs rst --dir ../cli
 
 endif