Skip to content

Commit 24c92fd

Browse files
authored
Merge pull request #50 from mboersma/update-go
chore(rootfs/Dockerfile): upgrade to Go 1.7
2 parents 259b737 + c47f93c commit 24c92fd

3 files changed

Lines changed: 3 additions & 4 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ IMAGE := ${REGISTRY}${IMAGE_PREFIX}/go-dev:${VERSION}
77
SHELL_SCRIPTS = /usr/local/bin/gen-changelog.sh /usr/local/bin/test-cover.sh
88

99
# dockerized development environment variables
10-
DEV_ENV_PREFIX := docker run --rm -e GO15VENDOREXPERIMENT=1
10+
DEV_ENV_PREFIX := docker run --rm
1111
DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${IMAGE}
1212

1313
build:

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ included tools or scripts. Here's an example of running `glide up` for deis/buil
2828

2929
```console
3030
$ docker run --rm \
31-
--env GO15VENDOREXPERIMENT=1 \
3231
--volume $GOPATH/src/github.com/deis/builder:/go/src/github.com/deis/builder \
3332
--workdir /go/src/github.com/deis/builder \
3433
quay.io/deis/go-dev:latest \

rootfs/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM golang:1.6.3
1+
FROM golang:1.7
22

3-
ENV GLIDE_VERSION=v0.11.1 GLIDE_HOME=/root GO15VENDOREXPERIMENT=1
3+
ENV GLIDE_VERSION=v0.11.1 GLIDE_HOME=/root
44

55
RUN apt-get update && apt-get install -y \
66
jq \

0 commit comments

Comments
 (0)