postgresql

diff --git a/services/boot/controller.go b/services/boot/controller.go
index 7ddb65bc44f7b0138d354b30f193506ed0bb788e..4b3e249ac582083bb7be64818337eb5449202db5 100644 (file)
--- a/services/boot/controller.go
+++ b/services/boot/controller.go
@@ -31,14 +31,14 @@ func (c *controller) Boot(ctx context.Context) error {
                                nomad,
                        },
                },
-               Concurrent{
-                       dispatchLocal,
-                       dispatchSLURM,
-                       gitHTTP,
-                       keepbalance,
-                       keepproxy,
-                       keepstore,
-                       websocket,
-               },
+               // Concurrent{
+               //      dispatchLocal,
+               //      dispatchSLURM,
+               //      gitHTTP,
+               //      keepbalance,
+               //      keepproxy,
+               //      keepstore,
+               //      websocket,
+               // },
        }.Boot(ctx)
 }

diff --git a/services/boot/postgresql.go b/services/boot/postgresql.go
index 2be582b166daabae058d4cedac8a4dd958e54022..e92d365673d7528554016614bb978aed762a05e0 100644 (file)
--- a/services/boot/postgresql.go
+++ b/services/boot/postgresql.go
@@ -2,7 +2,6 @@ package main
 
 import (
        "context"
-       "os"
        "time"
 )
 
@@ -11,19 +10,10 @@ var postgresql = &pgBooter{}
 type pgBooter struct {}
 
 func (pb *pgBooter) Boot(ctx context.Context) error {
-       os.Setenv("LANG", "en_US.utf8")
        // TODO: return nil if this isn't the database host.
        if pb.check(ctx) == nil {
                return nil
        }
-       if err := (&osPackage{
-               Debian: "locales",
-       }).Boot(ctx); err != nil {
-               return err
-       }
-       if err := command("bash", "-c", "echo ${LANG} UTF-8 | tee -a /etc/locale.gen && locale-gen -a").Run(); err != nil {
-               return err
-       }
        if err := (&osPackage{
                Debian: "postgresql",
        }).Boot(ctx); err != nil {

diff --git a/services/boot/testimage_runit/Dockerfile b/services/boot/testimage_runit/Dockerfile
index d3aac96bb5b47973fffc38cf8caff3eab26c66e1..07e7c3c88f3eea262e5a8f142b912cc1363c7c8f 100644 (file)
--- a/services/boot/testimage_runit/Dockerfile
+++ b/services/boot/testimage_runit/Dockerfile
@@ -4,6 +4,9 @@ RUN apt-get update
 # preload (but don't install) packages arvados-boot might decide to install
 RUN DEBIAN_FRONTEND=noninteractive apt-get -dy install --no-install-recommends ca-certificates locales nginx postgresql runit
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends runit
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends runit locales
+
+RUN ["bash", "-c", "echo en_US.utf8 UTF-8 | tee -a /etc/locale.gen && locale-gen -a && \
+    (echo LANG=en_US.UTF-8; echo LC_ALL=en_US.UTF-8) > /etc/default/locale"]
 
 CMD ["bash", "-c", "coproc arvados-boot; runsvdir /etc/sv"]