Skip to content

Commit

Permalink
Revert "Update golang version to fix golang TLS issue for AD"
Browse files Browse the repository at this point in the history
  • Loading branch information
Denise committed Aug 2, 2018
1 parent e9216b3 commit 12df952
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.dapper
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN apt-get update && \
ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash

RUN wget -O - https://storage.googleapis.com/golang/go1.10.3.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \
RUN wget -O - https://storage.googleapis.com/golang/go1.9.2.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \
go get github.com/rancher/trash && go get github.com/golang/lint/golint

ENV DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 \
Expand Down
5 changes: 3 additions & 2 deletions pkg/image/export/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,9 @@ fi
set -e -x
REGISTRY=$1
docker load --input rancher-images.tar.gz`)
fmt.Fprint(load, "\n\n")
docker load --input rancher-images.tar.gz
`)

for _, saveImage := range saveImages(targetImages) {
fmt.Fprintf(load, "docker tag %s ${REGISTRY}/%s\n", saveImage, saveImage)
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-server
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ cd $(dirname $0)/..

mkdir -p bin
[ "$(uname)" != "Darwin" ] && LINKFLAGS="-linkmode external -extldflags -static -s"
go build -i -tags k8s -ldflags "-X main.VERSION=$VERSION $LINKFLAGS" -o bin/rancher
CGO_ENABLED=0 go build -i -tags k8s -ldflags "-X main.VERSION=$VERSION $LINKFLAGS" -o bin/rancher

0 comments on commit 12df952

Please sign in to comment.