Skip to content

Commit 79fb46e

Browse files
authored
chore(rootfs/Dockerfile): remove deprecated Go projects (#270)
1 parent 5e42202 commit 79fb46e

2 files changed

Lines changed: 6 additions & 25 deletions

File tree

README.md

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,10 @@ creating [issues][] and submitting [pull requests][].
1313
* based on [Ubuntu 18.04][]
1414
* [az][]: Azure cloud command-line tool
1515
* [azcopy][]: Utility for copying data to/from Microsoft Azure Blob and File storage
16-
* [dep][]: Go dependency management tool
1716
* [delve][]: debugger for the Go programming language
1817
* [Docker][]: Docker binaries to be able to bind mount /var/run/docker.sock in the dev environment container
19-
* [gb][]: project-based build tool for Go
2018
* [ginkgo][]: BDD testing framework for Go
21-
* [glide][]: Go dependency management tool
2219
* [go-bindata][]: converts any file into Go source code
23-
* [golint][]: Go source code linter
24-
* [gometalinter][]: run Go lint tools concurrently
2520
* [golangci-lint][]: concurrent runner for Go linting tools
2621
* [gox][]: simple Go cross-compiling tool
2722
* [helm][]: Kubernetes package manager
@@ -43,14 +38,14 @@ creating [issues][] and submitting [pull requests][].
4338
## Usage
4439

4540
Mount your local Go code into a container's `$GOPATH` to run any `go` command or one of the
46-
included tools or scripts. Here's an example of running `glide up` for deis/builder:
41+
included tools or scripts. Here's an example of running `ginko` for deis/builder:
4742

4843
```console
4944
$ docker run --rm \
5045
--volume $GOPATH/src/github.com/deis/builder:/go/src/github.com/deis/builder \
5146
--workdir /go/src/github.com/deis/builder \
5247
quay.io/deis/go-dev:latest \
53-
glide up
48+
ginkgo -r
5449
```
5550

5651
## Releases
@@ -87,18 +82,13 @@ You will be prompted to confirm again before any tag or release is written to Gi
8782
[az]: https://github.com/Azure/azure-cli#readme
8883
[azcopy]: https://docs.microsoft.com/en-us/azure/storage/common/storage-use-azcopy-linux?toc=%2fazure%2fstorage%2ffiles%2ftoc.json
8984
[deisrel]: https://github.com/deis/deisrel
90-
[delve]: https://github.com/derekparker/delve
91-
[dep]: https://github.com/golang/dep
85+
[delve]: https://github.com/go-delve/delve
9286
[Docker Hub]: https://hub.docker.com
9387
[Docker]: http://www.docker.com
94-
[gb]: https://github.com/constabulary/gb/
9588
[gen-changelog.sh]: https://github.com/deis/docker-go-dev/tree/master/rootfs/usr/local/bin/gen-changelog.sh
9689
[ginkgo]: https://github.com/onsi/ginkgo
97-
[glide]: https://github.com/Masterminds/glide
9890
[go-bindata]: https://github.com/jteeuwen/go-bindata
9991
[Go]: https://golang.org/
100-
[golint]: https://github.com/golang/lint
101-
[gometalinter]: https://github.com/alecthomas/gometalinter
10292
[golangci-lint]: https://github.com/golangci/golangci-lint
10393
[gox]: https://github.com/mitchellh/gox
10494
[helm]: https://github.com/kubernetes/helm

rootfs/Dockerfile

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,15 @@ LABEL name="deis-go-dev" \
55

66
ENV ANSIBLE_VERSION=2.10.3 \
77
AZCLI_VERSION=2.17.1 \
8-
PYJWT_VERSION=1.7.1 \
98
DOCKER_VERSION=20.10.2 \
9+
ETCDCTL_VERSION=v3.1.8 \
1010
GO_VERSION=1.15.8 \
11-
GLIDE_VERSION=v0.13.3 \
12-
GLIDE_HOME=/root \
11+
GOLANGCI_LINT_VERSION=v1.31.0 \
1312
HELM_VERSION=3.5.0 \
1413
KUBECTL_VERSION=v1.16.3 \
15-
ETCDCTL_VERSION=v3.1.8 \
16-
GOLANGCI_LINT_VERSION=v1.31.0 \
1714
PACKER_VERSION=1.6.1 \
1815
PROTOBUF_VERSION=3.7.0 \
16+
PYJWT_VERSION=1.7.1 \
1917
PYWINRM_VERSION=0.4.1 \
2018
SHELLCHECK_VERSION=v0.7.1 \
2119
SHFMT_VERSION=3.1.2 \
@@ -64,8 +62,6 @@ RUN \
6462
yq \
6563
zip \
6664
&& curl -L https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz | tar -C /usr/local -xz \
67-
&& curl -sSL https://github.com/Masterminds/glide/releases/download/${GLIDE_VERSION}/glide-${GLIDE_VERSION}-linux-amd64.tar.gz \
68-
| tar -vxz -C /usr/local/bin --strip=1 \
6965
&& curl -sSL -o /tmp/protoc.zip https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protoc-${PROTOBUF_VERSION}-linux-x86_64.zip \
7066
&& unzip /tmp/protoc.zip 'bin/protoc' -d /usr/local \
7167
&& rm /tmp/protoc.zip \
@@ -76,7 +72,6 @@ RUN \
7672
&& chmod 700 get_helm.sh && ./get_helm.sh --version v${HELM_VERSION} \
7773
&& rm ./get_helm.sh \
7874
&& mkdir -p /go/bin \
79-
&& curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh \
8075
&& curl -sSL https://aka.ms/downloadazcopy-v10-linux | tar -vxz -C /usr/local/bin --strip=1 \
8176
&& mv /usr/local/bin/azcopy /usr/local/bin/azcopy-preview \
8277
&& curl -sSL https://aka.ms/downloadazcopylinux64 | tar -vxz -C /tmp \
@@ -93,17 +88,13 @@ RUN \
9388
&& go get -u -v \
9489
github.com/AlekSi/gocov-xml \
9590
github.com/axw/gocov/gocov \
96-
github.com/constabulary/gb/... \
9791
github.com/go-delve/delve/cmd/dlv \
9892
github.com/dgrijalva/jwt-go/cmd/jwt \
9993
github.com/golang/protobuf/protoc-gen-go \
10094
github.com/haya14busa/goverage \
10195
github.com/jteeuwen/go-bindata/... \
10296
github.com/mitchellh/gox \
10397
github.com/onsi/ginkgo/ginkgo \
104-
gopkg.in/alecthomas/gometalinter.v2 \
105-
&& ln -s ${GOPATH}/bin/gometalinter.v2 ${GOPATH}/bin/gometalinter \
106-
&& gometalinter.v2 --install \
10798
&& curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b ${GOPATH}/bin ${GOLANGCI_LINT_VERSION} \
10899
&& curl -sSL https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz \
109100
| tar -vxJ -C /usr/local/bin --strip=1 \

0 commit comments

Comments
 (0)