diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-04-26 13:00:44 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-04-26 13:00:44 -0700 |
| commit | 89c5cb596df9f3bbbf1d024fb59df2b799c85fba (patch) | |
| tree | bb9ae905ada472eb788c485b09dd8db214fb227d /tools/dockerfile/grpc_interop_http2 | |
| parent | 6c8ae9aad5f1aaaf9c043817e184ec26bee75c86 (diff) | |
| parent | c3d869ef5853c4cfad57b7d3694d5260eeb7ce75 (diff) | |
Merge github.com:grpc/grpc into split-me-baby-one-more-time
Diffstat (limited to 'tools/dockerfile/grpc_interop_http2')
| -rw-r--r-- | tools/dockerfile/grpc_interop_http2/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/dockerfile/grpc_interop_http2/Dockerfile b/tools/dockerfile/grpc_interop_http2/Dockerfile index bb60f09f24..ec71a53c2d 100644 --- a/tools/dockerfile/grpc_interop_http2/Dockerfile +++ b/tools/dockerfile/grpc_interop_http2/Dockerfile @@ -27,10 +27,10 @@ # (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.4 +FROM golang:1.5 # Using login shell removes Go from path, so we add it. -RUN ln -s /usr/src/go/bin/go /usr/local/bin +RUN ln -s /usr/local/go/bin/go /usr/local/bin # Define the default command. CMD ["bash"] |