Merge branch 'fix-pipeline-failures' of...

Merge branch 'fix-pipeline-failures' of gitlab.com:gitlab-org/ci-cd/docker-machine into dbickford-add-darwin-arm64-build

.gitlab/ci/Dockerfile

 FROM golang:1.13.15-alpine3.12
 
+# Force build - 2022-10-03T17:42:00+0000
 RUN apk add --no-cache make git py-pip bash curl && \
     pip install awscli
 

.gitlab/ci/scripts/release_s3.sh

@@ -6,11 +6,18 @@ __aws_s3_sync() {
   local source="$1"
   local target="$2"
 
+  local awsDebug=""
+  if [[ -n "${DEBUG_AWS_CLI}" ]]; then
+      awsDebug="--debug"
+  fi
+
+  echo -e "\033[32;1mSyncing with ${target}\033[0m"
+
   if [[ "${DEBUG_S3_SYNC}" == "true" ]]; then
     set -x
   fi
 
-  aws s3 sync "${source}" "${target}" --acl public-read
+  aws ${awsDebug} --color on s3 sync "${source}" "${target}" --acl public-read
   set +x
 }
 
@@ -40,9 +47,18 @@ echo "Generated Index page"
 
 __aws_s3_sync bin "${S3_URL}"
 
+set -x
+git -c versionsort.prereleaseSuffix="-rc" tag -l "v*.*.*" --sort=-v:refname | awk '!/rc/' | head -n 1
+set +x
+
 # Copy the binaries to the latest directory.
 LATEST_STABLE_TAG=$(git -c versionsort.prereleaseSuffix="-rc" tag -l "v*.*.*" --sort=-v:refname | awk '!/rc/' | head -n 1)
+
+echo "Latest stable tag is: ${LATEST_STABLE_TAG}"
+
 if [ $(git describe --exact-match --match ${LATEST_STABLE_TAG} >/dev/null 2>&1) ]; then
+    echo "Syncing the 'latest' bucket"
+
   __aws_s3_sync bin "s3://${S3_BUCKET}/latest"
 fi
 

Dockerfile

@@ -7,8 +7,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
                 sshfs \
         && rm -rf /var/lib/apt/lists/*
 
-RUN GO111MODULE=on go get golang.org/x/lint/golint \
-                          golang.org/x/tools/cover
+ENV GO111MODULE=on
+
+RUN go get golang.org/x/tools@v0.1.12
+RUN go get golang.org/x/lint/golint
+RUN go get golang.org/x/tools/cover
+
+ENV GO111MODULE=off
 
 ENV USER root
 WORKDIR /go/src/github.com/docker/machine