projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ce6f044
)
3824: Import GPG key needed for RVM installation.
author
Tom Clegg <tom@curoverse.com>
Thu, 30 Oct 2014 18:48:05 +0000
(14:48 -0400)
committer
Tom Clegg <tom@curoverse.com>
Thu, 30 Oct 2014 18:48:05 +0000
(14:48 -0400)
docker/base/Dockerfile
patch
|
blob
|
history
diff --git
a/docker/base/Dockerfile
b/docker/base/Dockerfile
index 01eec036d31ec44b830ff94de834f3935ee29045..2959d503b048bb74361376eb9d282b92cf2dab16 100644
(file)
--- a/
docker/base/Dockerfile
+++ b/
docker/base/Dockerfile
@@
-16,7
+16,9
@@
RUN apt-get update -qq
RUN apt-get install -qqy openssh-server apt-utils git curl \
libcurl3 libcurl3-gnutls libcurl4-openssl-dev locales \
RUN apt-get install -qqy openssh-server apt-utils git curl \
libcurl3 libcurl3-gnutls libcurl4-openssl-dev locales \
- postgresql-server-dev-9.1 && \
+ postgresql-server-dev-9.1 python-arvados-python-client
+
+RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
/bin/mkdir -p /root/.ssh && \
/bin/sed -ri 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
/usr/sbin/locale-gen && \
/bin/mkdir -p /root/.ssh && \
/bin/sed -ri 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
/usr/sbin/locale-gen && \
@@
-25,8
+27,6
@@
RUN apt-get install -qqy openssh-server apt-utils git curl \
/usr/local/rvm/bin/rvm alias create default ruby && \
/bin/mkdir -p /usr/src/arvados
/usr/local/rvm/bin/rvm alias create default ruby && \
/bin/mkdir -p /usr/src/arvados
-RUN apt-get install -qqy python-arvados-python-client
-
ADD generated/arvados.tar.gz /usr/src/arvados/
# Update gem. This (hopefully) fixes
ADD generated/arvados.tar.gz /usr/src/arvados/
# Update gem. This (hopefully) fixes