diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 437693c2a..655f946fd 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -3,7 +3,7 @@ # Apply database migrations echo "Apply database migrations" # python FusionIIIT/manage.py makemigrations -python FusionIIIT/manage.py migrate +# python FusionIIIT/manage.py migrate # Start server echo "Starting server" diff --git a/scripts/script.go b/scripts/script.go index 63371a154..e47aab783 100644 --- a/scripts/script.go +++ b/scripts/script.go @@ -54,6 +54,8 @@ var branchPorts = map[string]Ports{ "sa-4": {App: 8018, Db: 5468}, "hr": {App: 8020, Db: 5469}, "rspc": {App: 8021, Db: 5470}, + "ps-1": {App: 8022, Db: 5471}, + "ps-2": {App: 8023, Db: 5472}, } func main() { @@ -115,7 +117,7 @@ func main() { cmdRun(fmt.Sprintf("docker-compose -f %s up -d", filepath.Join(branchDir, "docker-compose.yml")), true) if len(*db_dumpPath) > 0 { - fmt.Printf("Importing dump into %s_db_1\n", branch) + fmt.Printf("Importing dump into %s_db_1\n", branch) cmdRun( fmt.Sprintf( "docker exec -i %s_db_1 psql -U fusion_admin -d fusionlab < %s", @@ -125,6 +127,13 @@ func main() { true) } + cmdRun( + fmt.Sprintf( + "docker exec -i %s_app_1 python FusionIIIT/manage.py migrate", + branch, + ), + true) + fmt.Printf("%s app started at port %d\n", branch, branchPorts[branch].App) } } @@ -276,4 +285,3 @@ func CopySymLink(source, dest string) error { } return os.Symlink(link, dest) } -