[ARVADOS] updated: 1.3.0-2503-gbc8854efa
Git user
git at public.arvados.org
Sat Apr 18 03:19:25 UTC 2020
Summary of changes:
go.mod | 2 +
tools/arvbox/lib/arvbox/docker/Dockerfile.base | 120 ++++++---------------
tools/arvbox/lib/arvbox/docker/Dockerfile.dev | 3 +-
tools/arvbox/lib/arvbox/docker/common.sh | 11 +-
tools/arvbox/lib/arvbox/docker/createusers.sh | 4 +-
.../lib/arvbox/docker/service/postgres/run-service | 2 +-
6 files changed, 48 insertions(+), 94 deletions(-)
via bc8854efac3c9b75288b810fa1fcd1b7dcb15d31 (commit)
from 2cf07544d4602b6983f7809cc6b19bc66c6aaf00 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit bc8854efac3c9b75288b810fa1fcd1b7dcb15d31
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Fri Apr 17 23:18:45 2020 -0400
16267: WIP upgrade arvbox to debian 10 & use dev installer
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/go.mod b/go.mod
index 4491b3598..83fece554 100644
--- a/go.mod
+++ b/go.mod
@@ -36,6 +36,8 @@ require (
github.com/lib/pq v1.3.0
github.com/marstr/guid v1.1.1-0.20170427235115-8bdf7d1a087c // indirect
github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747 // indirect
+ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+ github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/msteinert/pam v0.0.0-20190215180659-f29b9f28d6f9
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
github.com/opencontainers/image-spec v1.0.1-0.20171125024018-577479e4dc27 // indirect
diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
index b6d6c68e3..6969b0053 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -2,52 +2,36 @@
#
# SPDX-License-Identifier: AGPL-3.0
-FROM debian:9
+FROM debian:10
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && \
apt-get -yq --no-install-recommends -o Acquire::Retries=6 install \
- postgresql-9.6 postgresql-contrib-9.6 git build-essential runit curl libpq-dev \
- libcurl4-openssl-dev libssl1.0-dev zlib1g-dev libpcre3-dev libpam-dev \
- openssh-server python-setuptools netcat-traditional \
- python-epydoc graphviz bzip2 less sudo virtualenv \
- libpython-dev fuse libfuse-dev python-pip python-yaml \
- pkg-config libattr1-dev python-pycurl \
- libwww-perl libio-socket-ssl-perl libcrypt-ssleay-perl \
- libjson-perl nginx gitolite3 lsof libreadline-dev \
- apt-transport-https ca-certificates \
- linkchecker python3-virtualenv python-virtualenv xvfb iceweasel \
- libgnutls28-dev python3-dev vim cadaver cython gnupg dirmngr \
- libsecret-1-dev r-base r-cran-testthat libxml2-dev pandoc \
- python3-setuptools python3-pip openjdk-8-jdk bsdmainutils net-tools \
- ruby2.3 ruby-dev bundler && \
+ libsecret-1-0 libsecret-1-dev build-essential netcat-traditional \
+ golang libpam0g-dev locales git ca-certificates gnupg less && \
apt-get clean
-ENV RUBYVERSION_MINOR 2.3
-ENV RUBYVERSION 2.3.5
-
-# Install Ruby from source
-# RUN cd /tmp && \
-# curl -f http://cache.ruby-lang.org/pub/ruby/${RUBYVERSION_MINOR}/ruby-${RUBYVERSION}.tar.gz | tar -xzf - && \
-# cd ruby-${RUBYVERSION} && \
-# ./configure --disable-install-doc && \
-# make && \
-# make install && \
-# cd /tmp && \
-# rm -rf ruby-${RUBYVERSION}
-
-ENV GEM_HOME /var/lib/gems
-ENV GEM_PATH /var/lib/gems
-ENV PATH $PATH:/var/lib/gems/bin
-
-ENV GOVERSION 1.13.6
-
-# Install golang binary
-RUN curl -f http://storage.googleapis.com/golang/go${GOVERSION}.linux-amd64.tar.gz | \
- tar -C /usr/local -xzf -
+# Set UTF-8 locale
+RUN echo en_US.UTF-8 UTF-8 > /etc/locale.gen && locale-gen
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
-ENV PATH ${PATH}:/usr/local/go/bin
+ARG arvados_version_deps=16267-arv-install
+
+RUN git clone https://git.arvados.org/arvados.git && \
+ cd arvados && \
+ git checkout $arvados_version_deps && \
+ git log --oneline -n1 HEAD && \
+ go mod download && \
+ go run ./cmd/arvados-server install -type development -ruby package && \
+ cd .. && \
+ rm -rf arvados && \
+ rm -rf /root/go && \
+ apt-get clean && \
+ rm -rf /var/lib/postgresql && \
+ mkdir -p /var/lib/postgresql
VOLUME /var/lib/docker
VOLUME /var/log/nginx
@@ -58,60 +42,26 @@ RUN apt-key add --no-tty /tmp/8D81803C0EBFCD88.asc && \
rm -f /tmp/8D81803C0EBFCD88.asc
RUN mkdir -p /etc/apt/sources.list.d && \
- echo deb https://download.docker.com/linux/debian/ stretch stable > /etc/apt/sources.list.d/docker.list && \
+ echo deb [arch=amd64] https://download.docker.com/linux/debian buster stable > /etc/apt/sources.list.d/docker.list && \
apt-get update && \
- apt-get -yq --no-install-recommends install docker-ce=17.06.0~ce-0~debian && \
+ apt-get -yq --no-install-recommends install docker-ce=5:19.03.7~3-0~debian-buster && \
apt-get clean
-RUN rm -rf /var/lib/postgresql && mkdir -p /var/lib/postgresql
-
-ENV PJSVERSION=1.9.8
-# bitbucket is the origin, but downloads fail sometimes, so use our own mirror instead.
-#ENV PJSURL=https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-${PJSVERSION}-linux-x86_64.tar.bz2
-ENV PJSURL=http://cache.arvados.org/phantomjs-${PJSVERSION}-linux-x86_64.tar.bz2
-
-RUN set -e && \
- curl -L -f ${PJSURL} | tar -C /usr/local -xjf - && \
- ln -s ../phantomjs-${PJSVERSION}-linux-x86_64/bin/phantomjs /usr/local/bin
-
-ENV GDVERSION=v0.23.0
-ENV GDURL=https://github.com/mozilla/geckodriver/releases/download/$GDVERSION/geckodriver-$GDVERSION-linux64.tar.gz
-RUN set -e && curl -L -f ${GDURL} | tar -C /usr/local/bin -xzf - geckodriver
-
-RUN pip install -U setuptools
-
-ENV NODEVERSION v8.15.1
-
-# Install nodejs binary
-RUN curl -L -f https://nodejs.org/dist/${NODEVERSION}/node-${NODEVERSION}-linux-x64.tar.xz | tar -C /usr/local -xJf - && \
- ln -s ../node-${NODEVERSION}-linux-x64/bin/node ../node-${NODEVERSION}-linux-x64/bin/npm /usr/local/bin
-
-ENV GRADLEVERSION 5.3.1
-
-RUN cd /tmp && \
- curl -L -O https://services.gradle.org/distributions/gradle-${GRADLEVERSION}-bin.zip && \
- unzip gradle-${GRADLEVERSION}-bin.zip -d /usr/local && \
- ln -s ../gradle-${GRADLEVERSION}/bin/gradle /usr/local/bin && \
- rm gradle-${GRADLEVERSION}-bin.zip
-
-# Set UTF-8 locale
-RUN echo en_US.UTF-8 UTF-8 > /etc/locale.gen && locale-gen
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
+RUN mkdir -p /package && \
+ chmod 1755 /package && \
+ cd /package && \
+ curl -O http://smarden.org/runit/runit-2.1.2.tar.gz && \
+ tar xzf runit-2.1.2.tar.gz && \
+ cd admin/runit-2.1.2 && \
+ package/install && \
+ cp /package/admin/runit-2.1.2/command/* /sbin
ARG arvados_version
-RUN echo arvados_version is git commit $arvados_version
-ADD fuse.conf /etc/
-
-ADD gitolite.rc \
- keep-setup.sh common.sh createusers.sh \
- logger runsu.sh waitforpostgres.sh \
- yml_override.py api-setup.sh \
- go-setup.sh devenv.sh cluster-config.sh \
- /usr/local/lib/arvbox/
+RUN ln -sf /usr/src/arvados/tools/arvbox/lib/arvbox/docker /usr/local/lib/arvbox && \
+ echo arvados_version is git commit $arvados_version
+ADD fuse.conf /etc/
ADD runit /etc/runit
# Start the supervisor.
diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.dev b/tools/arvbox/lib/arvbox/docker/Dockerfile.dev
index 22668253e..43558b697 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.dev
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.dev
@@ -5,8 +5,7 @@
FROM arvados/arvbox-base
ARG arvados_version
-ADD service/ /var/lib/arvbox/service
-RUN ln -sf /var/lib/arvbox/service /etc
+RUN ln -sf /usr/src/arvados/tools/arvbox/lib/arvbox/docker/service /etc
RUN mkdir -p /var/lib/arvados
RUN echo "development" > /var/lib/arvados/api_rails_env
RUN echo "development" > /var/lib/arvados/sso_rails_env
diff --git a/tools/arvbox/lib/arvbox/docker/common.sh b/tools/arvbox/lib/arvbox/docker/common.sh
index 9c933e870..bd681254a 100644
--- a/tools/arvbox/lib/arvbox/docker/common.sh
+++ b/tools/arvbox/lib/arvbox/docker/common.sh
@@ -4,8 +4,8 @@
export PATH=${PATH}:/usr/local/go/bin:/var/lib/gems/bin
-export GEM_HOME=/var/lib/gems
-export GEM_PATH=/var/lib/gems
+#export GEM_HOME=/var/lib/gems
+#export GEM_PATH=/var/lib/gems
export npm_config_cache=/var/lib/npm
export npm_config_cache_min=Infinity
export R_LIBS=/var/lib/Rlibs
@@ -72,8 +72,11 @@ run_bundler() {
# flock /var/lib/gems/gems.lock gem install --verbose --no-document bundler --version ${bundleversion}
# fi
# fi
- if ! flock /var/lib/gems/gems.lock bundler install --verbose --path $GEM_HOME --local --no-deployment $frozen "$@" ; then
- flock /var/lib/gems/gems.lock bundler install --verbose --path $GEM_HOME --no-deployment $frozen "$@"
+# if ! flock /var/lib/gems/gems.lock bundler install --verbose --path $GEM_HOME --local --no-deployment $frozen "$@" ; then
+# flock /var/lib/gems/gems.lock bundler install --verbose --path $GEM_HOME --no-deployment $frozen "$@"
+ # fi
+ if ! flock /var/lib/gems/gems.lock bundler update --bundler --verbose --local --no-deployment $frozen "$@" ; then
+ flock /var/lib/gems/gems.lock bundler update --bundler --verbose --no-deployment $frozen "$@"
fi
}
diff --git a/tools/arvbox/lib/arvbox/docker/createusers.sh b/tools/arvbox/lib/arvbox/docker/createusers.sh
index 58fb41358..68f5ea776 100755
--- a/tools/arvbox/lib/arvbox/docker/createusers.sh
+++ b/tools/arvbox/lib/arvbox/docker/createusers.sh
@@ -45,8 +45,8 @@ if ! grep "^arvbox:" /etc/passwd >/dev/null 2>/dev/null ; then
cat <<EOF > /etc/profile.d/paths.sh
export PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/go/bin:/var/lib/gems/bin:$(ls -d /usr/local/node-*)/bin
-export GEM_HOME=/var/lib/gems
-export GEM_PATH=/var/lib/gems
+#export GEM_HOME=/var/lib/gems
+#export GEM_PATH=/var/lib/gems
export npm_config_cache=/var/lib/npm
export npm_config_cache_min=Infinity
export R_LIBS=/var/lib/Rlibs
diff --git a/tools/arvbox/lib/arvbox/docker/service/postgres/run-service b/tools/arvbox/lib/arvbox/docker/service/postgres/run-service
index a0771aa6a..f2377a0c2 100755
--- a/tools/arvbox/lib/arvbox/docker/service/postgres/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/postgres/run-service
@@ -6,7 +6,7 @@
exec 2>&1
set -eux -o pipefail
-PGVERSION=9.6
+PGVERSION=11
if ! test -d /var/lib/postgresql/$PGVERSION/main ; then
/usr/lib/postgresql/$PGVERSION/bin/initdb --locale=en_US.UTF-8 -D /var/lib/postgresql/$PGVERSION/main
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list