projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix building of metapackages for Ubuntu 18.04 and Ubuntu 20.04.
[arvados.git]
/
build
/
package-build-dockerfiles
/
ubuntu1804
/
Dockerfile
diff --git
a/build/package-build-dockerfiles/ubuntu1804/Dockerfile
b/build/package-build-dockerfiles/ubuntu1804/Dockerfile
index 05023aa09af50e5384e69db80ed5b253c91d72bb..fd18f3e202a81ecf29a29335221c8b84d1b40dc4 100644
(file)
--- a/
build/package-build-dockerfiles/ubuntu1804/Dockerfile
+++ b/
build/package-build-dockerfiles/ubuntu1804/Dockerfile
@@
-8,7
+8,7
@@
MAINTAINER Arvados Package Maintainers <packaging@arvados.org>
ENV DEBIAN_FRONTEND noninteractive
# Install dependencies.
ENV DEBIAN_FRONTEND noninteractive
# Install dependencies.
-RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python3 python3-pip libcurl4-gnutls-dev libgnutls28-dev curl git libattr1-dev libfuse-dev libpq-dev unzip tzdata python3-venv python3-dev libpam-dev
+RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python3 python3-pip libcurl4-gnutls-dev libgnutls28-dev curl git libattr1-dev libfuse-dev libpq-dev unzip tzdata python3-venv python3-dev libpam-dev
equivs
# Install virtualenv
RUN /usr/bin/pip3 install 'virtualenv<20'
# Install virtualenv
RUN /usr/bin/pip3 install 'virtualenv<20'
@@
-25,12
+25,12
@@
RUN gpg --import --no-tty /tmp/mpapis.asc && \
/usr/local/rvm/bin/rvm-exec default gem install fpm --version 1.10.2
# Install golang binary
/usr/local/rvm/bin/rvm-exec default gem install fpm --version 1.10.2
# Install golang binary
-ADD generated/go1.1
3.4
.linux-amd64.tar.gz /usr/local/
+ADD generated/go1.1
6.3
.linux-amd64.tar.gz /usr/local/
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
# Install nodejs and npm
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
# Install nodejs and npm
-ADD generated/node-v
6.11.2
-linux-x64.tar.xz /usr/local/
-RUN ln -s /usr/local/node-v
6.11.2
-linux-x64/bin/* /usr/local/bin/
+ADD generated/node-v
10.23.1
-linux-x64.tar.xz /usr/local/
+RUN ln -s /usr/local/node-v
10.23.1
-linux-x64/bin/* /usr/local/bin/
RUN git clone --depth 1 git://git.arvados.org/arvados.git /tmp/arvados && cd /tmp/arvados/services/api && /usr/local/rvm/bin/rvm-exec default bundle && cd /tmp/arvados/apps/workbench && /usr/local/rvm/bin/rvm-exec default bundle
RUN git clone --depth 1 git://git.arvados.org/arvados.git /tmp/arvados && cd /tmp/arvados/services/api && /usr/local/rvm/bin/rvm-exec default bundle && cd /tmp/arvados/apps/workbench && /usr/local/rvm/bin/rvm-exec default bundle