# HG changeset patch
# User smith@nwoca.org
# Date 1457715012 0
# Node ID e155908fa039deff1ad8c11524fa42ffb539928d
# Parent  7c5992231aed786fd6d23cce79da45ca50133aae
improve import and training scripts. include all containers in info

diff -r 7c5992231aed -r e155908fa039 scripts/d-ps.sh
--- a/scripts/d-ps.sh	Fri Mar 11 11:42:22 2016 -0500
+++ b/scripts/d-ps.sh	Fri Mar 11 16:50:12 2016 +0000
@@ -1,4 +1,4 @@
 #!/bin/bash
-docker ps --format="table {{.Names}}\t{{.Image}}\t{{.Status}}\t{{.Label \"io.ssdt.id\"}}\t{{.Label \"io.ssdt.app\"}}\t{{.Label \"io.ssdt.type\"}}" $@
+docker ps -a --format="table {{.Names}}\t{{.Image}}\t{{.Status}}\t{{.Label \"io.ssdt.id\"}}\t{{.Label \"io.ssdt.app\"}}\t{{.Label \"io.ssdt.type\"}}" $@
 
 
diff -r 7c5992231aed -r e155908fa039 scripts/import-usas.sh
--- a/scripts/import-usas.sh	Fri Mar 11 11:42:22 2016 -0500
+++ b/scripts/import-usas.sh	Fri Mar 11 16:50:12 2016 +0000
@@ -8,7 +8,8 @@
 export IMP_PATH=${IMP_PATH}
 export IMP_ANON=${IMP_ANON-}
 export IMP_EM=${IMP_EM-}
-
+#
+docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import.yml rm -f usasimport
 # start import and wait for completion
 docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import.yml up usasimport | tee usasimport.log
 # remove temporary container
diff -r 7c5992231aed -r e155908fa039 scripts/import-usps.sh
--- a/scripts/import-usps.sh	Fri Mar 11 11:42:22 2016 -0500
+++ b/scripts/import-usps.sh	Fri Mar 11 16:50:12 2016 +0000
@@ -9,6 +9,7 @@
 export IMP_ANON=${IMP_ANON:--a false}
 export IMP_EM=${IMP_EM-}
 
+docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import.yml rm -f uspsimport
 # start import and wait for completion
 docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import.yml up uspsimport | tee uspsimport.log
 # remove temporary container
diff -r 7c5992231aed -r e155908fa039 scripts/training.sh
--- a/scripts/training.sh	Fri Mar 11 11:42:22 2016 -0500
+++ b/scripts/training.sh	Fri Mar 11 16:50:12 2016 +0000
@@ -51,7 +51,7 @@
          cd $BASEDIR/$t
 
          docker-compose stop
-         docker-compose rm -f usasdb uspsdb
+         docker-compose rm -f usasdb uspsdb usasapp uspsapp
          docker-compose up -d usasdb uspsdb
          sleep 30 # delay to allow database startup and restore
          docker-compose up -d