[ARVADOS] updated: 1.2.0-7-g3bb337733
Git user
git at public.curoverse.com
Tue Nov 27 12:26:55 EST 2018
Summary of changes:
build/package-build-dockerfiles/Makefile | 6 +++++-
build/package-build-dockerfiles/ubuntu1804/Dockerfile | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
via 3bb33773377b7fb2ca9e251fd5a9e2a1a8f88547 (commit)
from 3378e69755efec6db6a78c638450375314ed33b8 (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 3bb33773377b7fb2ca9e251fd5a9e2a1a8f88547
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Tue Nov 27 14:26:40 2018 -0300
refs #14530. build new release. fix gpg error on bionic
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile
index 9dc536bf1..f76837b15 100644
--- a/build/package-build-dockerfiles/Makefile
+++ b/build/package-build-dockerfiles/Makefile
@@ -30,8 +30,9 @@ ubuntu1804/generated: common-generated-all
GOTARBALL=go1.10.1.linux-amd64.tar.gz
NODETARBALL=node-v6.11.2-linux-x64.tar.xz
+RVMKEY=rvm.asc
-common-generated-all: common-generated/$(GOTARBALL) common-generated/$(NODETARBALL)
+common-generated-all: common-generated/$(GOTARBALL) common-generated/$(NODETARBALL) common-generated/$(RVMKEY)
common-generated/$(GOTARBALL): common-generated
wget -cqO common-generated/$(GOTARBALL) http://storage.googleapis.com/golang/$(GOTARBALL)
@@ -39,5 +40,8 @@ common-generated/$(GOTARBALL): common-generated
common-generated/$(NODETARBALL): common-generated
wget -cqO common-generated/$(NODETARBALL) https://nodejs.org/dist/v6.11.2/$(NODETARBALL)
+common-generated/$(RVMKEY): common-generated
+ wget -cqO common-generated/$(RVMKEY) https://rvm.io/mpapis.asc
+
common-generated:
mkdir common-generated
diff --git a/build/package-build-dockerfiles/ubuntu1804/Dockerfile b/build/package-build-dockerfiles/ubuntu1804/Dockerfile
index 68df124d9..c66de4690 100644
--- a/build/package-build-dockerfiles/ubuntu1804/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu1804/Dockerfile
@@ -11,7 +11,8 @@ ENV DEBIAN_FRONTEND noninteractive
RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-pip libcurl4-gnutls-dev libgnutls28-dev curl git libattr1-dev libfuse-dev libpq-dev python-pip unzip tzdata
# Install RVM
-RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys D39DC0E3 && \
+ADD generated/rvm.asc /tmp/
+RUN gpg --import /tmp/rvm.asc && \
curl -L https://get.rvm.io | bash -s stable && \
/usr/local/rvm/bin/rvm install 2.3 && \
/usr/local/rvm/bin/rvm alias create default ruby-2.3 && \
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list