Merge pull request #10409 from ncteisen/v1.2.x-docker-patch

Cherry pick: update go version in Dockerfile to 1.8
pull/10446/head
Noah Eisen 8 years ago committed by GitHub
commit 6e31006871
  1. 2
      templates/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile.template
  2. 2
      templates/tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile.template
  3. 2
      templates/tools/dockerfile/stress_test/grpc_interop_stress_go/Dockerfile.template
  4. 2
      tools/dockerfile/interoptest/grpc_interop_go/Dockerfile
  5. 2
      tools/dockerfile/interoptest/grpc_interop_http2/Dockerfile
  6. 2
      tools/dockerfile/stress_test/grpc_interop_stress_go/Dockerfile

@ -29,7 +29,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
FROM golang:1.5
FROM golang:latest
<%include file="../../go_path.include"/>
<%include file="../../python_deps.include"/>

@ -29,7 +29,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
FROM golang:1.5
FROM golang:latest
<%include file="../../go_path.include"/>
<%include file="../../python_deps.include"/>

@ -29,7 +29,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
FROM golang:1.5
FROM golang:latest
<%include file="../../gcp_api_libraries.include"/>
<%include file="../../python_deps.include"/>

@ -27,7 +27,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
FROM golang:1.5
FROM golang:latest
# Using login shell removes Go from path, so we add it.
RUN ln -s /usr/local/go/bin/go /usr/local/bin

@ -27,7 +27,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
FROM golang:1.5
FROM golang:latest
# Using login shell removes Go from path, so we add it.
RUN ln -s /usr/local/go/bin/go /usr/local/bin

@ -27,7 +27,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
FROM golang:1.5
FROM golang:latest
# Google Cloud platform API libraries
RUN apt-get update && apt-get install -y python-pip && apt-get clean

Loading…
Cancel
Save