You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2017/06/26 21:22:35 UTC
[1/2] thrift git commit: THRIFT-4213 Travis build fails at curl -sSL
https://www.npmjs.com/install.sh | sh Client: Build process Patch: Eric
Conner
Repository: thrift
Updated Branches:
refs/heads/master c55fdb953 -> 4aaa92ece
THRIFT-4213 Travis build fails at curl -sSL https://www.npmjs.com/install.sh | sh
Client: Build process
Patch: Eric Conner <er...@pinterest.com>
This closes #1295
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/2b1975a4
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/2b1975a4
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/2b1975a4
Branch: refs/heads/master
Commit: 2b1975a4ceb250fe82b1735f46bc116de8c3ce9a
Parents: c55fdb9
Author: Eric Conner <er...@pinterest.com>
Authored: Sat Jun 24 08:19:32 2017 -0700
Committer: Jens Geyer <je...@apache.org>
Committed: Mon Jun 26 23:20:22 2017 +0200
----------------------------------------------------------------------
build/docker/ubuntu/Dockerfile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/2b1975a4/build/docker/ubuntu/Dockerfile
----------------------------------------------------------------------
diff --git a/build/docker/ubuntu/Dockerfile b/build/docker/ubuntu/Dockerfile
index 1fe494b..06aa5c8 100644
--- a/build/docker/ubuntu/Dockerfile
+++ b/build/docker/ubuntu/Dockerfile
@@ -137,11 +137,11 @@ RUN apt-get install -y --no-install-recommends \
neko-dev \
libneko0
+# Newer release of nodejs
+RUN curl -sL https://deb.nodesource.com/setup_6.x | bash
RUN apt-get install -y --no-install-recommends \
`# Node.js dependencies` \
- nodejs \
- nodejs-dev \
- nodejs-legacy
+ nodejs
RUN apt-get install -y --no-install-recommends \
`# CSharp dependencies` \
@@ -191,7 +191,7 @@ RUN mkdir -p /usr/lib/haxe && \
# Node.js
# temporarily removed since this breaks the build (and is not needed to test C# code)
-#RUN curl -sSL https://www.npmjs.com/install.sh | sh
+# RUN curl -sSL https://www.npmjs.com/install.sh | sh
# D
RUN curl -sSL http://downloads.dlang.org/releases/2.x/2.070.0/dmd_2.070.0-0_amd64.deb -o /tmp/dmd_2.070.0-0_amd64.deb && \
[2/2] thrift git commit: THRIFT-4234 Travis build fails cross
language tests with "Unsupported security protocol type" Client: C# Patch:
Eric Conner
Posted by je...@apache.org.
THRIFT-4234 Travis build fails cross language tests with "Unsupported security protocol type"
Client: C#
Patch: Eric Conner <er...@pinterest.com>
This closes #1296
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/4aaa92ec
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/4aaa92ec
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/4aaa92ec
Branch: refs/heads/master
Commit: 4aaa92ece8503a6da9bc6701604f69acf2b99d07
Parents: 2b1975a
Author: Eric Conner <er...@pinterest.com>
Authored: Sun Jun 25 17:26:23 2017 +0200
Committer: Jens Geyer <je...@apache.org>
Committed: Mon Jun 26 23:21:15 2017 +0200
----------------------------------------------------------------------
build/docker/ubuntu/Dockerfile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/4aaa92ec/build/docker/ubuntu/Dockerfile
----------------------------------------------------------------------
diff --git a/build/docker/ubuntu/Dockerfile b/build/docker/ubuntu/Dockerfile
index 06aa5c8..a1ff5a1 100644
--- a/build/docker/ubuntu/Dockerfile
+++ b/build/docker/ubuntu/Dockerfile
@@ -143,9 +143,11 @@ RUN apt-get install -y --no-install-recommends \
`# Node.js dependencies` \
nodejs
-RUN apt-get install -y --no-install-recommends \
+# Add mono package repository url to get latest version of mono
+RUN echo "deb http://download.mono-project.com/repo/debian trusty main" | tee /etc/apt/sources.list.d/mono.list
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A6A19B38D3D831EF
+RUN apt-get update && apt-get install -y --no-install-recommends \
`# CSharp dependencies` \
- libmono-system-web2.0-cil \
mono-devel
RUN apt-get install -y --no-install-recommends \