[ARVADOS] updated: 02b75a37c98f3357ba079d01166576153032a238

Git user git at public.curoverse.com
Wed May 10 17:11:01 EDT 2017


Summary of changes:
 apps/workbench/fpm-info.sh                            | 9 ++++++++-
 build/package-build-dockerfiles/ubuntu1604/Dockerfile | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

       via  02b75a37c98f3357ba079d01166576153032a238 (commit)
      from  411109e1c30d61bce39f29851838540e0a5787e5 (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 02b75a37c98f3357ba079d01166576153032a238
Author: Ward Vandewege <ward at curoverse.com>
Date:   Wed May 10 17:09:06 2017 -0400

    The Workbench package has a build-time dependency on tzdata for
    Ubuntu1604, which is not included in the default upstream docker image.
    Add it to our list of dependencies.
    
    Also tweak Workbench package dependencies, no need to expliclitly list
    g++ for CentOS7.
    
    No issue #

diff --git a/apps/workbench/fpm-info.sh b/apps/workbench/fpm-info.sh
index c9afa15..7262083 100644
--- a/apps/workbench/fpm-info.sh
+++ b/apps/workbench/fpm-info.sh
@@ -1 +1,8 @@
-fpm_depends+=(git g++)
+case "$TARGET" in
+    centos*)
+        fpm_depends+=(git)
+        ;;
+    debian* | ubuntu*)
+        fpm_depends+=(git g++)
+        ;;
+esac
diff --git a/build/package-build-dockerfiles/ubuntu1604/Dockerfile b/build/package-build-dockerfiles/ubuntu1604/Dockerfile
index fec55e6..265141c 100644
--- a/build/package-build-dockerfiles/ubuntu1604/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu1604/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial
 MAINTAINER Ward Vandewege <ward at curoverse.com>
 
 # Install dependencies and set up system.
-RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev libgnutls-dev curl git libattr1-dev libfuse-dev libpq-dev python-pip unzip
+RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev libgnutls-dev curl git libattr1-dev libfuse-dev libpq-dev python-pip unzip tzdata
 
 # Install RVM
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list