[ARVADOS] updated: faea13100918186a69345ed3bd756aae86f74337

Git user git at public.curoverse.com
Tue Jul 18 10:53:12 EDT 2017


Summary of changes:
 build/package-build-dockerfiles/debian9/Dockerfile | 8 +++++---
 build/run-build-packages.sh                        | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

       via  faea13100918186a69345ed3bd756aae86f74337 (commit)
      from  5b4d924ca998a7e3d7b2d22eb3c745b2f1aa04d2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit faea13100918186a69345ed3bd756aae86f74337
Author: Nico Cesar <nico at curoverse.com>
Date:   Tue Jul 18 10:51:42 2017 -0400

    11980: debian stretch and libperl license change
    
    refs #11980
    
    Arvados-DCO-1.1-Signed-off-by: Nicolas Cesar <nico at curoverse.com>

diff --git a/build/package-build-dockerfiles/debian9/Dockerfile b/build/package-build-dockerfiles/debian9/Dockerfile
index 4bb776d..8f6dc6f 100644
--- a/build/package-build-dockerfiles/debian9/Dockerfile
+++ b/build/package-build-dockerfiles/debian9/Dockerfile
@@ -2,7 +2,8 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-FROM debian:9
+## dont use debian:9 here since the word 'stretch' is used for rvm precompiled binaries
+FROM debian:stretch
 MAINTAINER Nico Cesar <nico at curoverse.com>
 
 ENV DEBIAN_FRONTEND noninteractive
@@ -19,8 +20,9 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
     /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
 
 # Install golang binary
-ADD generated/go1.8.3.linux-amd64.tar.gz /usr/local/
-RUN ln -s /usr/local/go/bin/go /usr/local/bin/
+COPY generated/go1.8.3.linux-amd64.tar.gz /usr/local/
+RUN cd /usr/local && ls && tar xzvf go1.8.3.linux-amd64.tar.gz
+UN ln -s /usr/local/go/bin/go /usr/local/bin/
 
 # Old versions of setuptools cannot build a schema-salad package.
 RUN pip install --upgrade setuptools
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 5e5797e..39c4093 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -220,7 +220,7 @@ if [[ -z "$ONLY_BUILD" ]] || [[ "libarvados-perl" = "$ONLY_BUILD" ]] ; then
         make install INSTALLDIRS=perl >"$STDOUT_IF_DEBUG" && \
         fpm_build install/lib/=/usr/share libarvados-perl \
         "Curoverse, Inc." dir "$(version_from_git)" install/man/=/usr/share/man \
-        "$WORKSPACE/LICENSE-2.0.txt=/usr/share/doc/libarvados-perl/LICENSE-2.0.txt" && \
+        "$WORKSPACE/apache-2.0.txt=/usr/share/doc/libarvados-perl/apache-2.0.txt" && \
         mv --no-clobber libarvados-perl*.$FORMAT "$WORKSPACE/packages/$TARGET/"
   fi
 fi

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list