simplified migrate.py

Dockerfile

@@ -27,6 +27,10 @@ COPY ./docker-entrypoint.sh /usr/local/bin/
 
 COPY ./migrate.py /usr/local/bin/
 
+COPY ./migrate-core /usr/local/bin/
+
+COPY ./migrate-user /usr/local/bin/
+
 RUN rm -rf /var/log/*
 
 VOLUME "/var/lib/postgresql/backup"

docker-entrypoint.sh

@@ -151,12 +151,14 @@ if [ "$1" = 'postgres' ]; then
                 export PGUSER="postgres"
                 export PGDATABASE="postgres"
                 echo "Running core migrate"
-                migrate.py --folder /docker-entrypoint-initdb-core.d/ --init
+                migrate-core --init
+                #migrate.py --folder /docker-entrypoint-initdb-core.d/ --init
 
                 #export PGUSER="${POSTGRES_USER}"
                 export PGDATABASE="${POSTGRES_DB}"
                 echo "Running user migrate"
-                migrate.py --folder /docker-entrypoint-initdb.d/ --init
+                migrate-user --init
+                #migrate.py --folder /docker-entrypoint-initdb.d/ --init
 
 		PGUSER="${PGUSER:-postgres}" \
 		pg_ctl -D "$PGDATA" -m fast -w stop

migrate-core

@@ -0,0 +1,3 @@
+#! /usr/bin/env bash
+
+migrate.py --folder /docker-entrypoint-initdb-core.d/ $* | tee -a /var/lib/postgresql/data/migrate-core.log

migrate-user

@@ -0,0 +1,3 @@
+#! /usr/bin/env bash
+
+migrate.py --folder /docker-entrypoint-initdb.d/ $* | tee -a /var/lib/postgresql/data/migrate-user.log

migrate.py

@@ -82,7 +82,7 @@ def run_migrations(folder, version_from, version_to, no_run, file_runners):
         print('Not running because --no-run was specified')
 
     if version_from is None:
-        print('Initialising from %s (inclusive) to %s (inclusive)' % (versions[0], version_to))
+        print('Initializing from %s (inclusive) to %s (inclusive)' % (versions[0], version_to))
     else:
         print('Migrating from %s (exclusive) to %s (inclusive)' % (version_from, version_to))
 
@@ -100,6 +100,11 @@ def run_migrations(folder, version_from, version_to, no_run, file_runners):
             run_migration(folder, files, version, no_run, file_runners)
             last_version = version
 
+    if version_from is None:
+        print('Initialized from %s (inclusive) to %s (inclusive)' % (versions[0], version_to))
+    else:
+        print('Migrated from %s (exclusive) to %s (inclusive)' % (version_from, version_to))
+
     return 0
 
 def main():