You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by fo...@apache.org on 2018/11/25 20:59:33 UTC

[avro] branch AVRO-2238 created (now fddf0f2)

This is an automated email from the ASF dual-hosted git repository.

fokko pushed a change to branch AVRO-2238
in repository https://gitbox.apache.org/repos/asf/avro.git.


      at fddf0f2  Fix the csharp tests

This branch includes the following new commits:

     new 638794b  AVRO-2238 Update Dockerfile base image from java to openjdk
     new fddf0f2  Fix the csharp tests

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[avro] 02/02: Fix the csharp tests

Posted by fo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

fokko pushed a commit to branch AVRO-2238
in repository https://gitbox.apache.org/repos/asf/avro.git

commit fddf0f2a0e70254a609f5c98fa8ed0bfcf652b85
Author: Fokko Driesprong <fo...@godatadriven.com>
AuthorDate: Sun Nov 25 20:54:03 2018 +0100

    Fix the csharp tests
---
 share/docker/Dockerfile | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/share/docker/Dockerfile b/share/docker/Dockerfile
index 49f4f90..91db8df 100644
--- a/share/docker/Dockerfile
+++ b/share/docker/Dockerfile
@@ -31,6 +31,8 @@ RUN apt-get -qq update && \
   apt-get -qq install software-properties-common apt-transport-https -y && \
   curl https://packages.sury.org/php/apt.gpg | apt-key add - && \
   echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list && \
+  apt-key adv --no-tty --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
+  echo "deb https://download.mono-project.com/repo/debian stable-stretch main" | tee /etc/apt/sources.list.d/mono-official-stable.list && \
   apt-get -qq update && \
   apt-get -qq install --no-install-recommends -y \
     ant \
@@ -93,15 +95,6 @@ RUN curl -L http://cpanmin.us | perl - --self-upgrade && \
   IO::String Object::Tiny Compress::Zlib Test::More \
   Test::Exception Test::Pod
 
-# Install mono modules
-RUN mkdir -p /tmp/nunit/ && \
-  cd /tmp/nunit/ && \
-  curl -L -s -o nunit.zip https://github.com/nunit-legacy/nunitv2/releases/download/2.7.0/NUnit-2.7.0.zip && \
-  unzip nunit.zip && \
-  rm nunit.zip
-
-ENV MONO_PATH /tmp/nunit/bin/lib
-
 # Install Ruby modules
 RUN gem install echoe yajl-ruby multi_json snappy
 


[avro] 01/02: AVRO-2238 Update Dockerfile base image from java to openjdk

Posted by fo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

fokko pushed a commit to branch AVRO-2238
in repository https://gitbox.apache.org/repos/asf/avro.git

commit 638794bd7ee06ea7c28d7c06358e5d9db67da8cd
Author: Fokko Driesprong <fo...@godatadriven.com>
AuthorDate: Mon Nov 12 20:35:22 2018 +0100

    AVRO-2238 Update Dockerfile base image from java to openjdk
---
 share/docker/Dockerfile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/share/docker/Dockerfile b/share/docker/Dockerfile
index ec8ac34..49f4f90 100644
--- a/share/docker/Dockerfile
+++ b/share/docker/Dockerfile
@@ -17,7 +17,7 @@
 # Dockerfile for installing the necessary dependencies for building Avro.
 # See BUILD.txt.
 
-FROM java:8-jdk
+FROM openjdk:8
 
 WORKDIR /root
 
@@ -28,6 +28,10 @@ RUN curl -sL https://deb.nodesource.com/setup_4.x | bash -
 
 # Install dependencies from packages
 RUN apt-get -qq update && \
+  apt-get -qq install software-properties-common apt-transport-https -y && \
+  curl https://packages.sury.org/php/apt.gpg | apt-key add - && \
+  echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list && \
+  apt-get -qq update && \
   apt-get -qq install --no-install-recommends -y \
     ant \
     asciidoc \
@@ -46,15 +50,14 @@ RUN apt-get -qq update && \
     libglib2.0-dev \
     libjansson-dev \
     libsnappy-dev \
-    libsnappy1 \
     make \
     maven \
     mono-devel \
     nodejs \
     nunit \
     perl \
-    php5 \
-    php5-gmp \
+    php5.6 \
+    php5.6-gmp \
     phpunit \
     python \
     python-setuptools \