Merge pull request #6245 from jtattermusch/upgrade_go_to_1.5

Upgrade go docker image to golang:1.5
pull/6247/head
Jan Tattermusch 9 years ago
commit da04f53743
  1. 2
      templates/tools/dockerfile/go_path.include
  2. 2
      templates/tools/dockerfile/stress_test/grpc_interop_stress_go/Dockerfile.template
  3. 4
      tools/dockerfile/grpc_interop_go/Dockerfile
  4. 4
      tools/dockerfile/grpc_interop_http2/Dockerfile
  5. 4
      tools/dockerfile/stress_test/grpc_interop_stress_go/Dockerfile

@ -1,2 +1,2 @@
# 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

@ -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.4
FROM golang:1.5
<%include file="../../gcp_api_libraries.include"/>
<%include file="../../go_path.include"/>

@ -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"]

@ -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"]

@ -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.4
FROM golang:1.5
# Google Cloud platform API libraries
RUN apt-get update && apt-get install -y python-pip && apt-get clean
@ -35,7 +35,7 @@ RUN pip install --upgrade google-api-python-client
# 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"]

Loading…
Cancel
Save