[ARVADOS] updated: 973c9d87c964cd517704b8f0ba487a644f5d635d
Git user
git at public.curoverse.com
Thu Dec 29 10:47:28 EST 2016
Summary of changes:
build/package-test-dockerfiles/centos6/Dockerfile | 4 ++--
build/package-test-dockerfiles/centos7/Dockerfile | 4 ++--
build/package-test-dockerfiles/debian7/Dockerfile | 7 ++++---
build/package-test-dockerfiles/debian8/Dockerfile | 7 ++++---
build/package-test-dockerfiles/ubuntu1204/Dockerfile | 9 +++++----
build/package-test-dockerfiles/ubuntu1404/Dockerfile | 9 +++++----
build/run-build-packages-one-target.sh | 3 +++
7 files changed, 25 insertions(+), 18 deletions(-)
via 973c9d87c964cd517704b8f0ba487a644f5d635d (commit)
via d1f91106df53f5333acdfc5ec299c852d8ddfb46 (commit)
from 25c212007d4c6ef14cf730526246bc8876700bb6 (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 973c9d87c964cd517704b8f0ba487a644f5d635d
Author: Tom Clegg <tom at curoverse.com>
Date: Thu Dec 29 10:45:55 2016 -0500
Obey --only-build arg in "test packages" mode.
diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index 16c7129..09e3011 100755
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -174,6 +174,9 @@ docker_volume_args=(
if [[ -n "$test_packages" ]]; then
for p in $packages ; do
+ if [[ -n "$ONLY_BUILD" ]] && [[ "$p" != "$ONLY_BUILD" ]]; then
+ continue
+ fi
echo
echo "START: $p test on $IMAGE" >&2
if docker run --rm \
commit d1f91106df53f5333acdfc5ec299c852d8ddfb46
Author: Tom Clegg <tom at curoverse.com>
Date: Thu Dec 29 10:37:27 2016 -0500
Update package-test images to ruby 2.3
diff --git a/build/package-test-dockerfiles/centos6/Dockerfile b/build/package-test-dockerfiles/centos6/Dockerfile
index d38507a..46229cf 100644
--- a/build/package-test-dockerfiles/centos6/Dockerfile
+++ b/build/package-test-dockerfiles/centos6/Dockerfile
@@ -8,8 +8,8 @@ RUN yum -q install --assumeyes scl-utils centos-release-scl \
RUN touch /var/lib/rpm/* && \
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.1 && \
- /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \
+ /usr/local/rvm/bin/rvm install 2.3 && \
+ /usr/local/rvm/bin/rvm alias create default ruby-2.3 && \
/usr/local/rvm/bin/rvm-exec default gem install bundle && \
/usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
diff --git a/build/package-test-dockerfiles/centos7/Dockerfile b/build/package-test-dockerfiles/centos7/Dockerfile
index 6bc40bf..06a39ca 100644
--- a/build/package-test-dockerfiles/centos7/Dockerfile
+++ b/build/package-test-dockerfiles/centos7/Dockerfile
@@ -7,8 +7,8 @@ RUN yum -q -y install scl-utils centos-release-scl which tar
RUN touch /var/lib/rpm/* && \
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.1 && \
- /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \
+ /usr/local/rvm/bin/rvm install 2.3 && \
+ /usr/local/rvm/bin/rvm alias create default ruby-2.3 && \
/usr/local/rvm/bin/rvm-exec default gem install bundle && \
/usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
diff --git a/build/package-test-dockerfiles/debian7/Dockerfile b/build/package-test-dockerfiles/debian7/Dockerfile
index c9a2fdc..c85d24c 100644
--- a/build/package-test-dockerfiles/debian7/Dockerfile
+++ b/build/package-test-dockerfiles/debian7/Dockerfile
@@ -2,11 +2,12 @@ FROM debian:7
MAINTAINER Peter Amstutz <peter.amstutz at curoverse.com>
# Install RVM
-RUN apt-get update && apt-get -y install curl procps && \
+RUN apt-get update && \
+ DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends curl procps && \
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.1 && \
- /usr/local/rvm/bin/rvm alias create default ruby-2.1
+ /usr/local/rvm/bin/rvm install 2.3 && \
+ /usr/local/rvm/bin/rvm alias create default ruby-2.3
# udev daemon can't start in a container, so don't try.
RUN mkdir -p /etc/udev/disabled
diff --git a/build/package-test-dockerfiles/debian8/Dockerfile b/build/package-test-dockerfiles/debian8/Dockerfile
index cde1847..9283db2 100644
--- a/build/package-test-dockerfiles/debian8/Dockerfile
+++ b/build/package-test-dockerfiles/debian8/Dockerfile
@@ -2,11 +2,12 @@ FROM debian:8
MAINTAINER Peter Amstutz <peter.amstutz at curoverse.com>
# Install RVM
-RUN apt-get update && apt-get -y install curl && \
+RUN apt-get update && \
+ DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends curl && \
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.1 && \
- /usr/local/rvm/bin/rvm alias create default ruby-2.1
+ /usr/local/rvm/bin/rvm install 2.3 && \
+ /usr/local/rvm/bin/rvm alias create default ruby-2.3
# udev daemon can't start in a container, so don't try.
RUN mkdir -p /etc/udev/disabled
diff --git a/build/package-test-dockerfiles/ubuntu1204/Dockerfile b/build/package-test-dockerfiles/ubuntu1204/Dockerfile
index 0cb77c8..decab6c 100644
--- a/build/package-test-dockerfiles/ubuntu1204/Dockerfile
+++ b/build/package-test-dockerfiles/ubuntu1204/Dockerfile
@@ -2,13 +2,14 @@ FROM ubuntu:precise
MAINTAINER Peter Amstutz <peter.amstutz at curoverse.com>
# Install RVM
-RUN apt-get update && apt-get -y install curl && \
+RUN apt-get update && \
+ DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends curl && \
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.1 && \
- /usr/local/rvm/bin/rvm alias create default ruby-2.1
+ /usr/local/rvm/bin/rvm install 2.3 && \
+ /usr/local/rvm/bin/rvm alias create default ruby-2.3
# udev daemon can't start in a container, so don't try.
RUN mkdir -p /etc/udev/disabled
-RUN echo "deb file:///arvados/packages/ubuntu1204/ /" >>/etc/apt/sources.list
\ No newline at end of file
+RUN echo "deb file:///arvados/packages/ubuntu1204/ /" >>/etc/apt/sources.list
diff --git a/build/package-test-dockerfiles/ubuntu1404/Dockerfile b/build/package-test-dockerfiles/ubuntu1404/Dockerfile
index 6c4d0e9..3e08600 100644
--- a/build/package-test-dockerfiles/ubuntu1404/Dockerfile
+++ b/build/package-test-dockerfiles/ubuntu1404/Dockerfile
@@ -2,13 +2,14 @@ FROM ubuntu:trusty
MAINTAINER Peter Amstutz <peter.amstutz at curoverse.com>
# Install RVM
-RUN apt-get update && apt-get -y install curl && \
+RUN apt-get update && \
+ DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends curl && \
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.1 && \
- /usr/local/rvm/bin/rvm alias create default ruby-2.1
+ /usr/local/rvm/bin/rvm install 2.3 && \
+ /usr/local/rvm/bin/rvm alias create default ruby-2.3
# udev daemon can't start in a container, so don't try.
RUN mkdir -p /etc/udev/disabled
-RUN echo "deb file:///arvados/packages/ubuntu1404/ /" >>/etc/apt/sources.list
\ No newline at end of file
+RUN echo "deb file:///arvados/packages/ubuntu1404/ /" >>/etc/apt/sources.list
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list