projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16100-mime-types'
[arvados.git]
/
build
/
package-test-dockerfiles
/
ubuntu1804
/
Dockerfile
diff --git
a/build/package-test-dockerfiles/ubuntu1804/Dockerfile
b/build/package-test-dockerfiles/ubuntu1804/Dockerfile
index d530d22a292545873331b65e8d27201e1d5ab747..2d4189879ec6c86ec38e7f80d49b1a15569c65f3 100644
(file)
--- a/
build/package-test-dockerfiles/ubuntu1804/Dockerfile
+++ b/
build/package-test-dockerfiles/ubuntu1804/Dockerfile
@@
-3,7
+3,7
@@
# SPDX-License-Identifier: AGPL-3.0
FROM ubuntu:bionic
# SPDX-License-Identifier: AGPL-3.0
FROM ubuntu:bionic
-MAINTAINER
Ward Vandewege <wvandewege@veritasgenetics.com
>
+MAINTAINER
Arvados Package Maintainers <packaging@arvados.org
>
ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND noninteractive
@@
-17,8
+17,9
@@
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 && \
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
+ /usr/local/rvm/bin/rvm install 2.5 && \
+ /usr/local/rvm/bin/rvm alias create default ruby-2.5 && \
+ /usr/local/rvm/bin/rvm-exec default gem install bundler --version 2.0.2
# udev daemon can't start in a container, so don't try.
RUN mkdir -p /etc/udev/disabled
# udev daemon can't start in a container, so don't try.
RUN mkdir -p /etc/udev/disabled