From 10306e784be5cd5fd1aea987fffee3dc73398a88 Mon Sep 17 00:00:00 2001 From: yhua Date: Thu, 15 Dec 2016 13:06:30 +0800 Subject: [PATCH] upgrade golang baseimage from 1.6.2 to 1.7.3 --- .travis.yml | 2 +- docs/compile_guide.md | 4 ++-- make/dev/jobservice/Dockerfile | 2 +- make/dev/ui/Dockerfile | 2 +- make/ubuntu/jobservice/Dockerfile | 2 +- make/ubuntu/ui/Dockerfile | 2 +- tools/Dockerfile.golang | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ba4b3f55..e463cfc70 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: true language: go go: - - 1.6.2 + - 1.7.3 go_import_path: github.com/vmware/harbor diff --git a/docs/compile_guide.md b/docs/compile_guide.md index 0b1c8f4e9..39530e3d6 100644 --- a/docs/compile_guide.md +++ b/docs/compile_guide.md @@ -63,13 +63,13 @@ You can compile the code by one of the three approaches: * Build Golang dev image: ```sh - $ make compile_buildgolangimage -e GOBUILDIMAGE=harborgo:1.6.2 + $ make compile_buildgolangimage -e GOBUILDIMAGE=harborgo:1.7.3 ``` * Build, install and bring up Harbor: ```sh - $ make install -e GOBUILDIMAGE=harborgo:1.6.2 COMPILETAG=compile_golangimage + $ make install -e GOBUILDIMAGE=harborgo:1.7.3 COMPILETAG=compile_golangimage ``` #### II. Compile code with your own Golang environment, then build Harbor diff --git a/make/dev/jobservice/Dockerfile b/make/dev/jobservice/Dockerfile index e9e525d3c..8cd8467e1 100644 --- a/make/dev/jobservice/Dockerfile +++ b/make/dev/jobservice/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.6.2 +FROM golang:1.7.3 MAINTAINER jiangd@vmware.com diff --git a/make/dev/ui/Dockerfile b/make/dev/ui/Dockerfile index dfa7ec5fa..822797d76 100644 --- a/make/dev/ui/Dockerfile +++ b/make/dev/ui/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.6.2 +FROM golang:1.7.3 MAINTAINER jiangd@vmware.com diff --git a/make/ubuntu/jobservice/Dockerfile b/make/ubuntu/jobservice/Dockerfile index 13a7f1491..0528c9ae4 100644 --- a/make/ubuntu/jobservice/Dockerfile +++ b/make/ubuntu/jobservice/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.6.2 +FROM golang:1.7.3 MAINTAINER jiangd@vmware.com diff --git a/make/ubuntu/ui/Dockerfile b/make/ubuntu/ui/Dockerfile index 6a39037b5..067741a4e 100644 --- a/make/ubuntu/ui/Dockerfile +++ b/make/ubuntu/ui/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.6.2 +FROM golang:1.7.3 MAINTAINER jiangd@vmware.com diff --git a/tools/Dockerfile.golang b/tools/Dockerfile.golang index 46f3ab523..ef4916388 100644 --- a/tools/Dockerfile.golang +++ b/tools/Dockerfile.golang @@ -1,4 +1,4 @@ -FROM golang:1.6.2 +FROM golang:1.7.3 RUN apt-get update \ && apt-get install -y libldap2-dev \