[ARVADOS] updated: 5cbf8527dfa71d905f9fa2dfdc45aa13997c438e

[Git user]

Summary of changes:
 tools/arvbox/lib/arvbox/docker/Dockerfile.base              | 9 +++++++--
 tools/arvbox/lib/arvbox/docker/service/postgres/run-service | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

       via  5cbf8527dfa71d905f9fa2dfdc45aa13997c438e (commit)
       via  8cbc52c458ce1fde1d0e8c33937690838f4af9b9 (commit)
      from  a2b75f5a2be7a37eea2e7f2ac3b0859cd5babebd (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 5cbf8527dfa71d905f9fa2dfdc45aa13997c438e
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Sep 18 15:13:36 2017 -0400

    Bump PhantomJS version no issue #
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
index 24c7ba7..39d5daf 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -65,10 +65,13 @@ RUN cd /root && \
     GOPATH=$PWD go get github.com/curoverse/runsvinit && \
     install bin/runsvinit /usr/local/bin
 
-ENV PJSVERSION=1.9.7
+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 http://cache.arvados.org/phantomjs-${PJSVERSION}-linux-x86_64.tar.bz2 | tar -C /usr/local -xjf - && \
+ curl -L -f ${PJSURL} | tar -C /usr/local -xjf - && \
  ln -s ../phantomjs-${PJSVERSION}-linux-x86_64/bin/phantomjs /usr/local/bin
 
 RUN pip install -U setuptools

commit 8cbc52c458ce1fde1d0e8c33937690838f4af9b9
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Sep 15 11:42:01 2017 -0400

    Arvbox explicitly initializes postgres with en_US.UTF-8 locale.  no issue #
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
index bf42951..24c7ba7 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -79,6 +79,8 @@ ENV NODEVERSION v6.11.2
 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
 
+RUN echo en_US.UTF-8 UTF-8 > /etc/locale.gen && locale-gen
+
 ARG arvados_version
 RUN echo arvados_version is git commit $arvados_version
 
diff --git a/tools/arvbox/lib/arvbox/docker/service/postgres/run-service b/tools/arvbox/lib/arvbox/docker/service/postgres/run-service
index 9137aa0..a0771aa 100755
--- a/tools/arvbox/lib/arvbox/docker/service/postgres/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/postgres/run-service
@@ -9,7 +9,7 @@ set -eux -o pipefail
 PGVERSION=9.6
 
 if ! test -d /var/lib/postgresql/$PGVERSION/main ; then
-    /usr/lib/postgresql/$PGVERSION/bin/initdb -D /var/lib/postgresql/$PGVERSION/main
+    /usr/lib/postgresql/$PGVERSION/bin/initdb --locale=en_US.UTF-8 -D /var/lib/postgresql/$PGVERSION/main
     sh -c "while ! (psql postgres -c'\du' | grep '^ arvbox ') >/dev/null ; do createuser -s arvbox ; sleep 1 ; done" &
 fi
 mkdir -p /var/run/postgresql/$PGVERSION-main.pg_stat_tmp

-----------------------------------------------------------------------


hooks/post-receive
--