projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '9945-make-python-package-dependency-free'
[arvados.git]
/
build
/
package-test-dockerfiles
/
ubuntu1404
/
Dockerfile
diff --git
a/build/package-test-dockerfiles/ubuntu1404/Dockerfile
b/build/package-test-dockerfiles/ubuntu1404/Dockerfile
index 5f5b1d88191b0ddf3019594094a505b0fac13ba5..c05dbee0f3b88bc4bb12964ce72d04efc5a66869 100644
(file)
--- a/
build/package-test-dockerfiles/ubuntu1404/Dockerfile
+++ b/
build/package-test-dockerfiles/ubuntu1404/Dockerfile
@@
-12,8
+12,10
@@
RUN apt-get update && \
apt-get -y install --no-install-recommends curl ca-certificates python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git libattr1-dev libfuse-dev libpq-dev python-pip unzip binutils build-essential ca-certificates
# Install RVM
apt-get -y install --no-install-recommends curl ca-certificates python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git libattr1-dev libfuse-dev libpq-dev python-pip unzip binutils build-essential ca-certificates
# Install RVM
-ADD generated/rvm.asc /tmp/
-RUN gpg --import /tmp/rvm.asc && \
+ADD generated/mpapis.asc /tmp/
+ADD generated/pkuczynski.asc /tmp/
+RUN gpg --import --no-tty /tmp/mpapis.asc && \
+ gpg --import --no-tty /tmp/pkuczynski.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
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