projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 11060-all-visible-repos
[arvados.git]
/
build
/
package-build-dockerfiles
/
ubuntu1604
/
Dockerfile
diff --git
a/build/package-build-dockerfiles/ubuntu1604/Dockerfile
b/build/package-build-dockerfiles/ubuntu1604/Dockerfile
index fec55e60d5d1e683e7cf483cc7abe24e789005e6..b1ec7ce91df442d14f49af600f64cde76004cbe3 100644
(file)
--- a/
build/package-build-dockerfiles/ubuntu1604/Dockerfile
+++ b/
build/package-build-dockerfiles/ubuntu1604/Dockerfile
@@
-2,7
+2,7
@@
FROM ubuntu:xenial
MAINTAINER Ward Vandewege <ward@curoverse.com>
# Install dependencies and set up system.
MAINTAINER Ward Vandewege <ward@curoverse.com>
# Install dependencies and set up system.
-RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev libgnutls-dev curl git libattr1-dev libfuse-dev libpq-dev python-pip unzip
+RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev libgnutls-dev curl git libattr1-dev libfuse-dev libpq-dev python-pip unzip
tzdata
# Install RVM
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
# Install RVM
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
@@
-13,7
+13,7
@@
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
/usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
# Install golang binary
/usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
# Install golang binary
-ADD generated/go1.
7.5
.linux-amd64.tar.gz /usr/local/
+ADD generated/go1.
8.3
.linux-amd64.tar.gz /usr/local/
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
ENV WORKSPACE /arvados
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
ENV WORKSPACE /arvados