Install Postgres locally for the lulz

fix #2 Signed-off-by: Yoan Blanc <yoan@dosimple.ch>

Author: greut

Dockerfile

@@ -13,8 +13,10 @@ EXPOSE 22 80 443
 # Runit
 ADD nginx.sh /etc/service/nginx/run
 ADD sshd.sh /etc/service/sshd/run
+ADD postgres.sh /etc/service/postgres/run
 RUN chmod +x /etc/service/nginx/run \
- && chmod +x /etc/service/sshd/run
+ && chmod +x /etc/service/sshd/run \
+ && chmod +x /etc/service/postgres/run
 
 # Bootstrap
 ADD boot.sh /usr/local/bin/boot.sh

boot.sh

@@ -9,6 +9,6 @@ if [ 0 -eq `ls /etc/ssh/ssh_host_* | wc -l` ]; then
 fi
 
 # create the users and finalize the setup.
-/usr/local/bin/configure.py
+/usr/local/bin/configure.py &
 
 exec /usr/bin/runsvdir -P /etc/service

configure.py

@@ -22,6 +22,7 @@
 import subprocess
 import sys
 import tempfile
+import time
 
 # Logging
 logger = logging.getLogger(__name__)
@@ -30,9 +31,6 @@
 with open('/root/accounts.json', 'r', encoding='utf-8') as f:
  USERS = json.load(f)
 
-SYSTEMD = True
-RUNIT = False
-
 if not len(USERS):
  logger.info('accounts.json is empty. Using the hardcoded folks.')
  USERS = {
@@ -60,9 +58,12 @@
  # }
  }
 
-HOSTNAME = "capistrano"
-POSTGRES_HOST = "localhost"
-POSTGRES_ROOT_PASSWORD = "root"
+HOSTNAME = os.environ.get("HOSTNAME", "capistrano")
+POSTGRES_HOST = os.environ.get("POSTGRES_HOST", "localhost")
+POSTGRES_PASSWORD = os.environ.get("POSTGRES_PASSWORD", "root")
+
+SYSTEMD = "RUNIT" not in os.environ
+RUNIT = "RUNIT" in os.environ
 
 
 def pwgen(length=64):
@@ -278,19 +279,46 @@ def init_user(user, keys, environ):
  return 0
 
 
+def init_postgres(password):
+ p = pwd.getpwnam('postgres')
+ uid, gid = p.pw_uid, p.pw_gid
+ homedir = p.pw_dir
+
+ os.initgroups('postgres', gid)
+ os.setgid(gid)
+ os.setuid(uid)
+ os.chdir(homedir)
+
+ subprocess.check_call([
+ 'psql', '-c',
+ "ALTER USER postgres WITH PASSWORD '{}';".format(password)
+ ])
+
+
 def main(argv):
  environ = {}
  environ["GEM_HOME"] = ".gem/ruby/2.4.0"
- environ["POSTGRES_HOST"] = os.environ.get('POSTGRES_HOST', POSTGRES_HOST)
+ environ["POSTGRES_HOST"] = POSTGRES_HOST
  environ["POSTGRES_PORT"] = "5432"
 
  delete = False if len(argv) < 2 else argv[1] == 'DELETE'
 
+ # Handle a local Postgres setup.
+ if POSTGRES_HOST == 'localhost':
+ logger.info('init postgres (with 5s of pause)')
+
+ # Wait for Postgres
+ time.sleep(5)
+ p = multiprocessing.Process(
+ target=init_postgres, args=(POSTGRES_PASSWORD, ))
+ p.start()
+ p.join()
+
  with tempfile.NamedTemporaryFile() as fp:
  logging.info('create temporary .pgpass')
  fp.write(
- bytearray('{}:*:*:postgres:{}'.format(environ[
- "POSTGRES_HOST"], POSTGRES_ROOT_PASSWORD), 'utf-8'))
+ bytearray('{}:*:*:postgres:{}'.format(environ["POSTGRES_HOST"],
+  POSTGRES_PASSWORD), 'utf-8'))
  fp.seek(0)
  os.chmod(fp.name, mode=0o600)
  environ['PGPASSFILE'] = fp.name

docker-compose.yml

@@ -9,20 +9,6 @@ services:
  - "2222:22"
  - "8080:80"
  environment:
- - POSTGRES_HOST=postgres
- - RACK_ENV=development
- depends_on:
- - postgres
-
- postgres:
- image: postgres:9.6-alpine
- environment:
+ - RUNIT=1
  - POSTGRES_PASSWORD=root
- - POSTGRES_PGDATA=/var/lib/postgresql/data/pgdata
- ports:
- - "5432:5432"
- volumes:
- - postgres:/var/lib/postgresql/data
-
-volumes:
- postgres:
+ - RACK_ENV=development

install.sh

@@ -94,15 +94,22 @@ apt-get update
 apt-get install -q -y \
  libpq-dev \
  nodejs \
+ postgresql-${POSTGRES_VERSION} \
  postgresql-client-${POSTGRES_VERSION} \
+ postgresql-contrib-${POSTGRES_VERSION} \
  ruby${RUBY_VERSION} \
  ruby${RUBY_VERSION}-dev \
  ruby-switch
 
-if [ "$DOCKER" = "" ]; then
- apt-get install -q -y \
- postgresql-${POSTGRES_VERSION} \
- postgresql-contrib-${POSTGRES_VERSION}
+if [ "$DOCKER" != "" ]; then
+ f=/etc/postgresql/9.6/main/postgresql.conf
+ sed -i 's/^#log_destination/log_destination/g' $f
+ sed -i 's/^#logging_collector/logging_collector/g' $f
+ sed -i 's/^ssl/#ssl/g' $f
+
+ d=/var/run/postgresql/9.6-main.pg_stat_tmp
+ mkdir $d
+ chown postgres:postgres $d
 fi
 
 # Post Installation

postgres.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+exec 2>&1
+export HOME=/var/lib/postgres
+exec chpst -u postgres -U postgres \
+ /usr/lib/postgresql/9.6/bin/postgres \
+ -D /etc/postgresql/9.6/main/