Skip to content

Commit b5c1273

Browse files
authored
Merge pull request #411 from mboersma/update-go-compiler
chore(Makefile): update to go-dev 0.17.0
2 parents 205876e + 797243e commit b5c1273

3 files changed

Lines changed: 29 additions & 32 deletions

File tree

Makefile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@ SHORT_NAME ?= builder
22

33
include versioning.mk
44

5-
# Enable vendor/ directory support.
6-
export GO15VENDOREXPERIMENT=1
7-
85
# dockerized development environment variables
96
REPO_PATH := github.com/deis/${SHORT_NAME}
10-
DEV_ENV_IMAGE := quay.io/deis/go-dev:0.16.0
7+
DEV_ENV_IMAGE := quay.io/deis/go-dev:0.17.0
118
DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
12-
DEV_ENV_PREFIX := docker run --rm -e GO15VENDOREXPERIMENT=1 -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
9+
DEV_ENV_PREFIX := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
1310
DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
1411

1512
# Get the component informtation to a tmp location and get replica count

pkg/sshd/util_test.go

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,33 @@ import (
88

99
const (
1010
testingClientKey = `-----BEGIN RSA PRIVATE KEY-----
11-
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
3636
-----END RSA PRIVATE KEY-----`
37-
testingClientFingerprint = `78:b9:21:20:1a:ed:e6:10:05:35:47:da:d4:1f:b6:73`
37+
testingClientFingerprint = `fa:61:1a:1f:45:6a:fa:32:5f:18:c4:4b:a5:b3:99:a3`
3838
)
3939

4040
func sshTestingClientKey() (ssh.Signer, error) {

rootfs/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/deis/base:0.2.0
1+
FROM quay.io/deis/base:0.3.1
22

33
RUN adduser --system \
44
--shell /bin/bash \

0 commit comments

Comments
 (0)