projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4084: Merge branch 'master' into 4084-log-pane-refresh-TC
[arvados.git]
/
docker
/
base
/
Dockerfile
diff --git
a/docker/base/Dockerfile
b/docker/base/Dockerfile
index 79cb42444ec33ab1a7a1ec822f8e9edd56534af7..2959d503b048bb74361376eb9d282b92cf2dab16 100644
(file)
--- a/
docker/base/Dockerfile
+++ b/
docker/base/Dockerfile
@@
-10,10
+10,15
@@
ENV DEBIAN_FRONTEND noninteractive
# * git, curl, rvm
# * Arvados source code in /usr/src/arvados, for preseeding gem installation
# * git, curl, rvm
# * Arvados source code in /usr/src/arvados, for preseeding gem installation
-RUN apt-get update && \
- apt-get -q -y install -q -y openssh-server apt-utils git curl \
+ADD apt.arvados.org.list /etc/apt/sources.list.d/
+RUN apt-key adv --keyserver pool.sks-keyservers.net --recv 1078ECD7
+RUN apt-get update -qq
+
+RUN apt-get install -qqy openssh-server apt-utils git curl \
libcurl3 libcurl3-gnutls libcurl4-openssl-dev locales \
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 && \
@@
-22,10
+27,6
@@
RUN apt-get update && \
/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
-ADD apt.arvados.org.list /etc/apt/sources.list.d/
-RUN apt-key adv --keyserver pgp.mit.edu --recv 1078ECD7
-RUN apt-get update && apt-get -qqy install 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