[ARVADOS] updated: 41f48ea20b33e59ced47a6e96f8198a76d43b619

Git user git at public.curoverse.com
Fri Jul 14 14:52:57 EDT 2017 

Summary of changes:
 build/build.list                                      |  2 +-
 build/package-build-dockerfiles/centos7/Dockerfile    | 12 ++++++------
 build/package-build-dockerfiles/debian8/Dockerfile    |  4 +++-
 build/package-build-dockerfiles/ubuntu1204/Dockerfile |  4 +++-
 build/package-build-dockerfiles/ubuntu1404/Dockerfile |  6 ++++--
 build/package-build-dockerfiles/ubuntu1604/Dockerfile |  4 +++-
 build/package-test-dockerfiles/centos7/Dockerfile     |  2 +-
 build/package-test-dockerfiles/debian8/Dockerfile     |  6 ++++--
 build/package-test-dockerfiles/ubuntu1204/Dockerfile  |  6 ++++--
 build/package-test-dockerfiles/ubuntu1404/Dockerfile  |  6 ++++--
 build/package-test-dockerfiles/ubuntu1604/Dockerfile  |  4 +++-
 build/run-build-packages.sh                           |  2 +-
 12 files changed, 37 insertions(+), 21 deletions(-)

       via  41f48ea20b33e59ced47a6e96f8198a76d43b619 (commit)
       via  6ff6c7a392a7064cba408b566a8ce5b86dadbc78 (commit)
      from  96ae27be78eeee85d9462123367b1221d5b96350 (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 41f48ea20b33e59ced47a6e96f8198a76d43b619
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jul 14 14:38:48 2017 -0400

    11973: Build avro 1.8.1 for ubuntu1604 and add to schema-salad deps.
    
    refs #11973
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>

diff --git a/build/build.list b/build/build.list
index 894eefa..596b406 100644
--- a/build/build.list
+++ b/build/build.list
@@ -24,7 +24,7 @@ debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|rdflib|4.2.2|2|python|all
 debian8,ubuntu1204,ubuntu1404,centos7|shellescape|3.4.1|2|python|all
 debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|mistune|0.7.3|2|python|all
 debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|typing|3.5.3.0|2|python|all
-debian8,ubuntu1204,ubuntu1404,centos7|avro|1.8.1|2|python|all
+debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|avro|1.8.1|2|python|all
 debian8,ubuntu1204,ubuntu1404,centos7|ruamel.ordereddict|0.4.9|2|python|amd64
 debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|cachecontrol|0.11.7|2|python|all
 debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|pathlib2|2.1.0|2|python|all
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index a8e730c..c933a02 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -409,7 +409,7 @@ fi
 saladversion=$(cat "$WORKSPACE/sdk/cwl/setup.py" | grep schema-salad== | sed "s/.*==\(.*\)'.*/\1/")
 test_package_presence python-schema-salad "$saladversion" python
 if [[ "$?" == "0" ]]; then
-  fpm_build schema_salad "" "" python $saladversion --depends "${PYTHON2_PKG_PREFIX}-lockfile >= 1:0.12.2-2"
+  fpm_build schema_salad "" "" python $saladversion --depends "${PYTHON2_PKG_PREFIX}-lockfile >= 1:0.12.2-2" --depends "${PYTHON2_PKG_PREFIX}-avro == 1.8.1-2"
 fi
 
 # And for cwltool we have the same problem as for schema_salad. Ward, 2016-03-17

commit 6ff6c7a392a7064cba408b566a8ce5b86dadbc78
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jul 14 13:58:43 2017 -0400

    11973: Set DEBIAN_FRONTEND=noninteractive in pkg-build/test images.
    
    Clean up some unnecessary inconsistencies in Dockerfiles.
    
    refs #11973
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>

diff --git a/build/package-build-dockerfiles/centos7/Dockerfile b/build/package-build-dockerfiles/centos7/Dockerfile
index 90d2e2f..0f084b3 100644
--- a/build/package-build-dockerfiles/centos7/Dockerfile
+++ b/build/package-build-dockerfiles/centos7/Dockerfile
@@ -3,15 +3,11 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 FROM centos:7
-MAINTAINER Brett Smith <brett at curoverse.com>
+MAINTAINER Ward Vandewege <ward at curoverse.com>
 
-# Install build dependencies provided in base distribution
+# Install dependencies.
 RUN yum -q -y install make automake gcc gcc-c++ libyaml-devel patch readline-devel zlib-devel libffi-devel openssl-devel bzip2 libtool bison sqlite-devel rpm-build git perl-ExtUtils-MakeMaker libattr-devel nss-devel libcurl-devel which tar unzip scl-utils centos-release-scl postgresql-devel python-devel python-setuptools fuse-devel xz-libs git
 
-# 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/
-
 # Install RVM
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
     curl -L https://get.rvm.io | bash -s stable && \
@@ -20,6 +16,10 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
     /usr/local/rvm/bin/rvm-exec default gem install bundler && \
     /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/
+
 # Need to "touch" RPM database to workaround bug in interaction between
 # overlayfs and yum (https://bugzilla.redhat.com/show_bug.cgi?id=1213602)
 RUN touch /var/lib/rpm/* && yum -q -y install python33
diff --git a/build/package-build-dockerfiles/debian8/Dockerfile b/build/package-build-dockerfiles/debian8/Dockerfile
index 1c46cc2..f5aced7 100644
--- a/build/package-build-dockerfiles/debian8/Dockerfile
+++ b/build/package-build-dockerfiles/debian8/Dockerfile
@@ -5,7 +5,9 @@
 FROM debian:jessie
 MAINTAINER Ward Vandewege <ward at curoverse.com>
 
-# Install dependencies and set up system.
+ENV DEBIAN_FRONTEND noninteractive
+
+# Install dependencies.
 RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git procps libattr1-dev libfuse-dev libgnutls28-dev libpq-dev python-pip unzip
 
 # Install RVM
diff --git a/build/package-build-dockerfiles/ubuntu1204/Dockerfile b/build/package-build-dockerfiles/ubuntu1204/Dockerfile
index fd47e7d..bf09089 100644
--- a/build/package-build-dockerfiles/ubuntu1204/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu1204/Dockerfile
@@ -5,7 +5,9 @@
 FROM ubuntu:precise
 MAINTAINER Ward Vandewege <ward at curoverse.com>
 
-# Install dependencies and set up system.
+ENV DEBIAN_FRONTEND noninteractive
+
+# Install dependencies.
 RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git libattr1-dev libfuse-dev libpq-dev python-pip build-essential unzip
 
 # Install RVM
diff --git a/build/package-build-dockerfiles/ubuntu1404/Dockerfile b/build/package-build-dockerfiles/ubuntu1404/Dockerfile
index 1a5e950..ecfcefc 100644
--- a/build/package-build-dockerfiles/ubuntu1404/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu1404/Dockerfile
@@ -3,9 +3,11 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 FROM ubuntu:trusty
-MAINTAINER Brett Smith <brett at curoverse.com>
+MAINTAINER Ward Vandewege <ward at curoverse.com>
 
-# Install dependencies and set up system.
+ENV DEBIAN_FRONTEND noninteractive
+
+# Install dependencies.
 RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git libattr1-dev libfuse-dev libpq-dev python-pip unzip
 
 # Install RVM
diff --git a/build/package-build-dockerfiles/ubuntu1604/Dockerfile b/build/package-build-dockerfiles/ubuntu1604/Dockerfile
index 7b0416b..b7c02d7 100644
--- a/build/package-build-dockerfiles/ubuntu1604/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu1604/Dockerfile
@@ -5,7 +5,9 @@
 FROM ubuntu:xenial
 MAINTAINER Ward Vandewege <ward at curoverse.com>
 
-# Install dependencies and set up system.
+ENV DEBIAN_FRONTEND noninteractive
+
+# Install dependencies.
 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
diff --git a/build/package-test-dockerfiles/centos7/Dockerfile b/build/package-test-dockerfiles/centos7/Dockerfile
index 4dc9aa1..fd2f9e3 100644
--- a/build/package-test-dockerfiles/centos7/Dockerfile
+++ b/build/package-test-dockerfiles/centos7/Dockerfile
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 FROM centos:7
-MAINTAINER Brett Smith <brett at curoverse.com>
+MAINTAINER Ward Vandewege <ward at curoverse.com>
 
 RUN yum -q -y install scl-utils centos-release-scl which tar
 
diff --git a/build/package-test-dockerfiles/debian8/Dockerfile b/build/package-test-dockerfiles/debian8/Dockerfile
index 3a0b0e9..dcf581a 100644
--- a/build/package-test-dockerfiles/debian8/Dockerfile
+++ b/build/package-test-dockerfiles/debian8/Dockerfile
@@ -3,11 +3,13 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 FROM debian:8
-MAINTAINER Peter Amstutz <peter.amstutz at curoverse.com>
+MAINTAINER Ward Vandewege <ward at curoverse.com>
+
+ENV DEBIAN_FRONTEND noninteractive
 
 # Install RVM
 RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends curl ca-certificates && \
+    apt-get -y install --no-install-recommends curl ca-certificates && \
     gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
     curl -L https://get.rvm.io | bash -s stable && \
     /usr/local/rvm/bin/rvm install 2.3 && \
diff --git a/build/package-test-dockerfiles/ubuntu1204/Dockerfile b/build/package-test-dockerfiles/ubuntu1204/Dockerfile
index b1c1499..75c0cea 100644
--- a/build/package-test-dockerfiles/ubuntu1204/Dockerfile
+++ b/build/package-test-dockerfiles/ubuntu1204/Dockerfile
@@ -3,11 +3,13 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 FROM ubuntu:precise
-MAINTAINER Peter Amstutz <peter.amstutz at curoverse.com>
+MAINTAINER Ward Vandewege <ward at curoverse.com>
+
+ENV DEBIAN_FRONTEND noninteractive
 
 # Install RVM
 RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends curl ca-certificates g++ && \
+    apt-get -y install --no-install-recommends curl ca-certificates g++ && \
     gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
     curl -L https://get.rvm.io | bash -s stable && \
     /usr/local/rvm/bin/rvm install 2.3 && \
diff --git a/build/package-test-dockerfiles/ubuntu1404/Dockerfile b/build/package-test-dockerfiles/ubuntu1404/Dockerfile
index 42d446f..8416847 100644
--- a/build/package-test-dockerfiles/ubuntu1404/Dockerfile
+++ b/build/package-test-dockerfiles/ubuntu1404/Dockerfile
@@ -3,11 +3,13 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 FROM ubuntu:trusty
-MAINTAINER Peter Amstutz <peter.amstutz at curoverse.com>
+MAINTAINER Ward Vandewege <ward at curoverse.com>
+
+ENV DEBIAN_FRONTEND noninteractive
 
 # Install RVM
 RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends curl ca-certificates && \
+    apt-get -y install --no-install-recommends curl ca-certificates && \
     gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
     curl -L https://get.rvm.io | bash -s stable && \
     /usr/local/rvm/bin/rvm install 2.3 && \
diff --git a/build/package-test-dockerfiles/ubuntu1604/Dockerfile b/build/package-test-dockerfiles/ubuntu1604/Dockerfile
index 0580e3a..25d49dc 100644
--- a/build/package-test-dockerfiles/ubuntu1604/Dockerfile
+++ b/build/package-test-dockerfiles/ubuntu1604/Dockerfile
@@ -5,9 +5,11 @@
 FROM ubuntu:xenial
 MAINTAINER Ward Vandewege <ward at curoverse.com>
 
+ENV DEBIAN_FRONTEND noninteractive
+
 # Install RVM
 RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends curl ca-certificates && \
+    apt-get -y install --no-install-recommends curl ca-certificates && \
     gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
     curl -L https://get.rvm.io | bash -s stable && \
     /usr/local/rvm/bin/rvm install 2.3 && \

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


hooks/post-receive
--

More information about the arvados-commits mailing list