Merge remote-tracking branch 'upstream/main'

Cryptophobia · Cryptophobia · commit e9e529f1e489 · 2021-07-17T20:42:38.000-04:00
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -0,0 +1,127 @@
+name: Docker
+
+on:
+  push:
+    # Publish `main` as Docker `latest` image.
+    branches:
+      - main
+    # Publish `v1.2.3` tags as releases.
+    tags:
+      - v*
+  # Run tests for any PRs against the main branch.
+  pull_request:
+    branches:
+      - main
+
+env:
+  IMAGE_NAME: go-dev
+
+jobs:
+  # Run tests.
+  # See also https://docs.docker.com/docker-hub/builds/automated-testing/
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Build container
+        run: |
+          if [ -f docker-compose.test.yml ]; then
+            docker-compose --file docker-compose.test.yml build
+          else
+            make build
+          fi
+
+      - name: Run tests
+        run: |
+          if [ -f docker-compose.test.yml ]; then
+            docker-compose --file docker-compose.test.yml run sut
+          else
+            make test
+          fi
+
+  # Push image to GitHub Packages, Docker Hub, and quay.io.
+  # Microsoft Container Registry (MCR) packaging and publishing is handled by
+  # an Azure Pipelines job.
+  # See also https://docs.docker.com/docker-hub/builds/
+  push:
+    # Ensure test job passes before pushing image.
+    needs: test
+
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Build image
+        run: docker build rootfs --tag $IMAGE_NAME
+
+      - name: Log into GitHub package registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
+
+      - name: Push image to GitHub package registry
+        run: |
+          IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME
+
+          # Change all uppercase to lowercase
+          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+
+          # Use Docker `latest` tag convention
+          [ "$VERSION" == "main" ] && VERSION=latest
+
+          echo IMAGE_ID=$IMAGE_ID
+          echo VERSION=$VERSION
+
+          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION
+
+      - name: Log into Docker Hub
+        run: echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u ${{ secrets.DOCKERHUB_USER }} --password-stdin
+
+      - name: Push image to Docker Hub
+        run: |
+          GITHUB_ORG=$(echo "${{ github.repository }}" | sed -e 's#/.*##')
+          IMAGE_ID=$GITHUB_ORG/$IMAGE_NAME
+
+          # Change all uppercase to lowercase
+          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+
+          # Use Docker `latest` tag convention
+          [ "$VERSION" == "main" ] && VERSION=latest
+
+          echo IMAGE_ID=$IMAGE_ID
+          echo VERSION=$VERSION
+
+          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION
+
+      - name: Log into quay.io
+        run: echo "${{ secrets.QUAYIO_PASSWORD }}" | docker login quay.io -u ${{ secrets.QUAYIO_USER }} --password-stdin
+
+      - name: Push image to quay.io
+        run: |
+          GITHUB_ORG=$(echo "${{ github.repository }}" | sed -e 's#/.*##')
+          IMAGE_ID=quay.io/$GITHUB_ORG/$IMAGE_NAME
+
+          # Change all uppercase to lowercase
+          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+
+          # Use Docker `latest` tag convention
+          [ "$VERSION" == "main" ] && VERSION=latest
+
+          echo IMAGE_ID=$IMAGE_ID
+          echo VERSION=$VERSION
+
+          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION
diff --git a/.travis.yml b/.travis.yml
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION := $(shell git describe --tags --exact-match 2>/dev/null || echo latest)
+VERSION ?= $(shell git describe --tags --exact-match 2>/dev/null || echo latest)
 REGISTRY ?= quay.io/
 IMAGE_PREFIX ?= deis
 IMAGE := ${REGISTRY}${IMAGE_PREFIX}/go-dev:${VERSION}
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # deis/go-dev
 
-[![Build Status](https://travis-ci.org/deis/docker-go-dev.svg?branch=master)](https://travis-ci.org/deis/docker-go-dev) [![Docker Repository on Quay](https://quay.io/repository/deis/go-dev/status "Docker Repository on Quay")](https://quay.io/repository/deis/go-dev)
+[![Build Status](https://github.com/deis/docker-go-dev/actions/workflows/docker-publish.yml/badge.svg)](https://quay.io/repository/deis/go-dev?tab=tags)
 
 A [Go][] language development toolbox.
 
@@ -13,16 +13,12 @@ creating [issues][] and submitting [pull requests][].
 * based on [Ubuntu 18.04][]
 * [az][]: Azure cloud command-line tool
 * [azcopy][]: Utility for copying data to/from Microsoft Azure Blob and File storage
-* [dep][]: Go dependency management tool
 * [delve][]: debugger for the Go programming language
 * [Docker][]: Docker binaries to be able to bind mount /var/run/docker.sock in the dev environment container
-* [gb][]: project-based build tool for Go
 * [ginkgo][]: BDD testing framework for Go
-* [glide][]: Go dependency management tool
 * [go-bindata][]: converts any file into Go source code
-* [golint][]: Go source code linter
-* [gometalinter][]: run Go lint tools concurrently
 * [golangci-lint][]: concurrent runner for Go linting tools
+* [goss][]: YAML-based tool for validating a server's configuration
 * [gox][]: simple Go cross-compiling tool
 * [helm][]: Kubernetes package manager
 * [jq][]: command-line JSON processor
@@ -39,21 +35,30 @@ creating [issues][] and submitting [pull requests][].
 * [upx][]: executable packer
 * [vim][]: text editor
 * [wamerican][]: American English dictionary words for /usr/share/dict
+
 ## Usage
 
 Mount your local Go code into a container's `$GOPATH` to run any `go` command or one of the
-included tools or scripts. Here's an example of running `glide up` for deis/builder:
+included tools or scripts. Here's an example of running `ginko` for deis/builder:
 
 ```console
 $ docker run --rm \
   --volume $GOPATH/src/github.com/deis/builder:/go/src/github.com/deis/builder \
   --workdir /go/src/github.com/deis/builder \
   quay.io/deis/go-dev:latest \
-  glide up
+  ginkgo -r
 ```
 
+## Releases
+
 The latest deis/go-dev Docker image is available at:
 
+* [Microsoft Container Registry][]
+  ```
+  docker pull mcr.microsoft.com/oss/azcu/go-dev:<tag>
+  ```
+  Browse the [go-dev index URL][] to see which tags are available.
+
 * [Quay.io][]
   ```
   docker pull quay.io/deis/go-dev
@@ -64,28 +69,44 @@ The latest deis/go-dev Docker image is available at:
   docker pull deis/go-dev
   ```
 
+To publish a new release of deis/go-dev, use the [deisrel][] tool:
+
+```console
+$ deisrel release docker-go-dev v1.28.7
+Doing a dry run of the component release...
+
+Creating changelog for docker-go-dev with tag v1.28.6 through commit 1a69c5502ef1bca014fbd3581451d1421829a42f
+
+
+### v1.28.6 -> v1.28.7
+...
+```
+
+If the CHANGELOG contents look correct, run the same command again but add the argument `--dry-run=false`.
+You will be prompted to confirm again before any tag or release is written to GitHub.
+
+
 [az]: https://github.com/Azure/azure-cli#readme
 [azcopy]: https://docs.microsoft.com/en-us/azure/storage/common/storage-use-azcopy-linux?toc=%2fazure%2fstorage%2ffiles%2ftoc.json
-[delve]: https://github.com/derekparker/delve
-[dep]: https://github.com/golang/dep
+[deisrel]: https://github.com/deis/deisrel
+[delve]: https://github.com/go-delve/delve
 [Docker Hub]: https://hub.docker.com
 [Docker]: http://www.docker.com
-[gb]: https://github.com/constabulary/gb/
 [gen-changelog.sh]: https://github.com/deis/docker-go-dev/tree/master/rootfs/usr/local/bin/gen-changelog.sh
 [ginkgo]: https://github.com/onsi/ginkgo
-[glide]: https://github.com/Masterminds/glide
 [go-bindata]: https://github.com/jteeuwen/go-bindata
 [Go]: https://golang.org/
-[golint]: https://github.com/golang/lint
-[gometalinter]: https://github.com/alecthomas/gometalinter
+[go-dev index URL]: https://mcr.microsoft.com/v2/oss/azcu/go-dev/tags/list
 [golangci-lint]: https://github.com/golangci/golangci-lint
+[goss]: https://github.com/aelsabbahy/goss
 [gox]: https://github.com/mitchellh/gox
 [helm]: https://github.com/kubernetes/helm
 [issues]: https://github.com/deis/docker-go-dev/issues
 [jq]: https://stedolan.github.io/jq/
 [jwt]: https://github.com/dgrijalva/jwt-go
 [k]: https://github.com/jakepearson/k
 [kubectl]: https://kubernetes.io/docs/user-guide/kubectl-overview/
+[Microsoft Container Registry]: https://github.com/microsoft/containerregistry
 [pull requests]: https://github.com/deis/docker-go-dev/pulls
 [Quay.io]: https://quay.io
 [Packer]: https://github.com/hashicorp/packer
diff --git a/_scripts/ci/deploy.sh b/_scripts/ci/deploy.sh
diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile
@@ -3,18 +3,22 @@ FROM ubuntu:18.04
 LABEL name="deis-go-dev" \
       maintainer="Matt Boersma <matt.boersma@microsoft.com>"
 
-ENV AZCLI_VERSION=2.12.1 \
-    DOCKER_VERSION=19.03.4 \
-    GO_VERSION=1.15.2 \
-    GLIDE_VERSION=v0.13.3 \
-    GLIDE_HOME=/root \
-    HELM_VERSION=v2.16.12 \
-    KUBECTL_VERSION=v1.16.3 \
+ENV ANSIBLE_VERSION=2.10.9 \
+    AZCLI_VERSION=2.26.1 \
+    DOCKER_VERSION=20.10.2 \
     ETCDCTL_VERSION=v3.1.8 \
-    GOLANGCI_LINT_VERSION=v1.31.0 \
+    GO_VERSION=1.16.6 \
+    GOLANGCI_LINT_VERSION=v1.41.1 \
+    GOSS_VERSION=v0.3.16 \
+    HELM_VERSION=3.6.2 \
+    KUBECTL_VERSION=v1.21.3 \
+    PACKER_VERSION=1.7.3 \
     PROTOBUF_VERSION=3.7.0 \
-    SHELLCHECK_VERSION=v0.7.1 \
-    SHFMT_VERSION=3.1.2 \
+    PYJWT_VERSION=2.1.0 \
+    PYWINRM_VERSION=0.4.1 \
+    SHELLCHECK_VERSION=v0.7.2 \
+    SHFMT_VERSION=3.3.0 \
+    UPX_VERSION=3.96 \
     PATH=$PATH:/usr/local/go/bin:/go/bin:/usr/local/bin/docker \
     GOPATH=/go
 
@@ -26,11 +30,9 @@ RUN \
   apt-get update && \
   apt-get install -y software-properties-common && \
   add-apt-repository ppa:rmescandon/yq && \
-  apt-add-repository --yes --update ppa:ansible/ansible && \
   apt-get update && \
   apt-get upgrade -y --no-install-recommends && \
   apt-get install -y --no-install-recommends \
-    ansible \
     bash \
     build-essential \
     ca-certificates \
@@ -54,26 +56,23 @@ RUN \
     rsync \
     ruby \
     unzip \
-    upx \
     util-linux \
     vim \
     wamerican \
     wget \
     yq \
     zip \
   && curl -L https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz | tar -C /usr/local -xz \
-  && curl -sSL https://github.com/Masterminds/glide/releases/download/${GLIDE_VERSION}/glide-${GLIDE_VERSION}-linux-amd64.tar.gz \
-    | tar -vxz -C /usr/local/bin --strip=1 \
   && curl -sSL -o /tmp/protoc.zip https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protoc-${PROTOBUF_VERSION}-linux-x86_64.zip \
   && unzip /tmp/protoc.zip 'bin/protoc' -d /usr/local \
   && rm /tmp/protoc.zip \
   && curl -sSL https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl \
   && chmod +x /usr/local/bin/kubectl \
   && mkdir -p ${GOPATH}/src/k8s.io/helm \
-  && curl -sSL https://storage.googleapis.com/kubernetes-helm/helm-${HELM_VERSION}-linux-amd64.tar.gz \
-    | tar -vxz -C /usr/local/bin --strip=1 \
+  && curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 \
+  && chmod 700 get_helm.sh && ./get_helm.sh --version v${HELM_VERSION} \
+  && rm ./get_helm.sh \
   && mkdir -p /go/bin \
-  && curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh \
   && curl -sSL https://aka.ms/downloadazcopy-v10-linux | tar -vxz -C /usr/local/bin --strip=1 \
   && mv /usr/local/bin/azcopy /usr/local/bin/azcopy-preview \
   && curl -sSL https://aka.ms/downloadazcopylinux64 | tar -vxz -C /tmp \
@@ -90,24 +89,30 @@ RUN \
   && go get -u -v \
     github.com/AlekSi/gocov-xml \
     github.com/axw/gocov/gocov \
-    github.com/constabulary/gb/... \
-    github.com/derekparker/delve/cmd/dlv \
+    github.com/go-delve/delve/cmd/dlv \
     github.com/dgrijalva/jwt-go/cmd/jwt \
     github.com/golang/protobuf/protoc-gen-go \
     github.com/haya14busa/goverage \
     github.com/jteeuwen/go-bindata/... \
     github.com/mitchellh/gox \
     github.com/onsi/ginkgo/ginkgo \
-    github.com/hashicorp/packer \
-    gopkg.in/alecthomas/gometalinter.v2 \
-  && ln -s ${GOPATH}/bin/gometalinter.v2 ${GOPATH}/bin/gometalinter \
-  && gometalinter.v2 --install \
   && curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b ${GOPATH}/bin ${GOLANGCI_LINT_VERSION} \
   && curl -sSL https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz \
     | tar -vxJ -C /usr/local/bin --strip=1 \
+  && curl -sSL https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip -o /tmp/packer.zip \
+    && unzip /tmp/packer.zip -d /usr/local/bin \
   && curl -o /usr/local/bin/shfmt -sSL https://github.com/mvdan/sh/releases/download/v{SHFMT_VERSION}/shfmt_v{SHFMT_VERSION}_linux_amd64 \
   && chmod +x /usr/local/bin/shfmt \
-  && pip3 install --disable-pip-version-check --no-cache-dir azure-cli==${AZCLI_VERSION} shyaml \
+  && curl -L "https://github.com/aelsabbahy/goss/releases/download/${GOSS_VERSION}/goss-linux-amd64" -o /usr/local/bin/goss \
+  && chmod +rx /usr/local/bin/goss \
+  && curl -L "https://github.com/aelsabbahy/goss/releases/download/${GOSS_VERSION}/dgoss" -o /usr/local/bin/dgoss \
+  && chmod +rx /usr/local/bin/dgoss \
+  && curl -sSL -o /tmp/upx.tar.xz https://github.com/upx/upx/releases/download/v${UPX_VERSION}/upx-${UPX_VERSION}-amd64_linux.tar.xz \
+  && tar -xvf /tmp/upx.tar.xz -C /tmp \
+  && mv /tmp/upx-${UPX_VERSION}-amd64_linux/upx /usr/local/bin/upx \
+  && pip3 install --disable-pip-version-check --no-cache-dir --upgrade pip \
+  && pip3 install --disable-pip-version-check --no-cache-dir azure-cli==${AZCLI_VERSION} PyJWT==${PYJWT_VERSION} shyaml ansible-base==${ANSIBLE_VERSION} pywinrm==${PYWINRM_VERSION} \
+  && ansible-galaxy collection install ansible.windows \
   && apt-get purge --auto-remove -y libffi-dev python3-dev \
   && apt-get autoremove -y \
   && apt-get clean -y \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION := $(shell git describe --tags --exact-match 2>/dev/null \|\| echo latest)`
	`1`	`+VERSION ?= $(shell git describe --tags --exact-match 2>/dev/null \|\| echo latest)`
`2`	`2`	`REGISTRY ?= quay.io/`
`3`	`3`	`IMAGE_PREFIX ?= deis`
`4`	`4`	`IMAGE := ${REGISTRY}${IMAGE_PREFIX}/go-dev:${VERSION}`