Преглед изворни кода

simplified migrate.py

tags/9.6-1.1.0
Robin Thoni пре 6 година
родитељ
комит
23491f0a22
5 измењених фајлова са 20 додато и 3 уклоњено
  1. 4
    0
      Dockerfile
  2. 4
    2
      docker-entrypoint.sh
  3. 3
    0
      migrate-core
  4. 3
    0
      migrate-user
  5. 6
    1
      migrate.py

+ 4
- 0
Dockerfile Прегледај датотеку

27
 
27
 
28
 COPY ./migrate.py /usr/local/bin/
28
 COPY ./migrate.py /usr/local/bin/
29
 
29
 
30
+COPY ./migrate-core /usr/local/bin/
31
+
32
+COPY ./migrate-user /usr/local/bin/
33
+
30
 RUN rm -rf /var/log/*
34
 RUN rm -rf /var/log/*
31
 
35
 
32
 VOLUME "/var/lib/postgresql/backup"
36
 VOLUME "/var/lib/postgresql/backup"

+ 4
- 2
docker-entrypoint.sh Прегледај датотеку

151
                 export PGUSER="postgres"
151
                 export PGUSER="postgres"
152
                 export PGDATABASE="postgres"
152
                 export PGDATABASE="postgres"
153
                 echo "Running core migrate"
153
                 echo "Running core migrate"
154
-                migrate.py --folder /docker-entrypoint-initdb-core.d/ --init
154
+                migrate-core --init
155
+                #migrate.py --folder /docker-entrypoint-initdb-core.d/ --init
155
 
156
 
156
                 #export PGUSER="${POSTGRES_USER}"
157
                 #export PGUSER="${POSTGRES_USER}"
157
                 export PGDATABASE="${POSTGRES_DB}"
158
                 export PGDATABASE="${POSTGRES_DB}"
158
                 echo "Running user migrate"
159
                 echo "Running user migrate"
159
-                migrate.py --folder /docker-entrypoint-initdb.d/ --init
160
+                migrate-user --init
161
+                #migrate.py --folder /docker-entrypoint-initdb.d/ --init
160
 
162
 
161
 		PGUSER="${PGUSER:-postgres}" \
163
 		PGUSER="${PGUSER:-postgres}" \
162
 		pg_ctl -D "$PGDATA" -m fast -w stop
164
 		pg_ctl -D "$PGDATA" -m fast -w stop

+ 3
- 0
migrate-core Прегледај датотеку

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

+ 3
- 0
migrate-user Прегледај датотеку

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

+ 6
- 1
migrate.py Прегледај датотеку

82
         print('Not running because --no-run was specified')
82
         print('Not running because --no-run was specified')
83
 
83
 
84
     if version_from is None:
84
     if version_from is None:
85
-        print('Initialising from %s (inclusive) to %s (inclusive)' % (versions[0], version_to))
85
+        print('Initializing from %s (inclusive) to %s (inclusive)' % (versions[0], version_to))
86
     else:
86
     else:
87
         print('Migrating from %s (exclusive) to %s (inclusive)' % (version_from, version_to))
87
         print('Migrating from %s (exclusive) to %s (inclusive)' % (version_from, version_to))
88
 
88
 
100
             run_migration(folder, files, version, no_run, file_runners)
100
             run_migration(folder, files, version, no_run, file_runners)
101
             last_version = version
101
             last_version = version
102
 
102
 
103
+    if version_from is None:
104
+        print('Initialized from %s (inclusive) to %s (inclusive)' % (versions[0], version_to))
105
+    else:
106
+        print('Migrated from %s (exclusive) to %s (inclusive)' % (version_from, version_to))
107
+
103
     return 0
108
     return 0
104
 
109
 
105
 def main():
110
 def main():

Loading…
Откажи
Сачувај