Mercurial > public > ssdt-docker

changeset 110:950df79a9d65 feature/djs-DEP-12-docker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DEP-12: update password configuration
author smith@nwoca.org
date Mon, 24 Apr 2017 15:20:17 +0100
parents 6ca3e22d50e4
children 7d781c057956
files compose3/preview/import-usas.yml compose3/preview/import-usps.yml compose3/preview/training.yml compose3/preview/usas-template.yml compose3/preview/usas.yml compose3/preview/usps.template.yml compose3/preview/usps.yml
diffstat 7 files changed, 62 insertions(+), 61 deletions(-) [+]
line wrap: on
line diff
--- a/compose3/preview/import-usas.yml	Fri Apr 21 20:42:58 2017 +0100
+++ b/compose3/preview/import-usas.yml	Mon Apr 24 15:20:17 2017 +0100
@@ -1,4 +1,4 @@
-version: "2"
+version: "3"
 services:
   usasimport:
     image: docker.ssdt.io/usas-import:preview
@@ -7,8 +7,4 @@
       - DB_HOST=usasdb
       - DB_NAME=usasdb
       - DB_USER=usas
-      - DB_PASS=usasdefault
-    environment:
-      - DB_NAME=usasdb
-      - DB_USER=usas
-      - DB_PASS=usasdefault
\ No newline at end of file
+      - DB_PASS=${USAS_DB_PASSWORD:-usasdefault}
--- a/compose3/preview/import-usps.yml	Fri Apr 21 20:42:58 2017 +0100
+++ b/compose3/preview/import-usps.yml	Mon Apr 24 15:20:17 2017 +0100
@@ -1,4 +1,4 @@
-version: "2"
+version: "3"
 services:
   uspsimport:
     image: docker.ssdt.io/usps-import:preview
@@ -7,4 +7,4 @@
       - DB_HOST=uspsdb
       - DB_NAME=uspsdb
       - DB_USER=usps
-      - DB_PASS=uspsdefault
\ No newline at end of file
+      - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}
\ No newline at end of file
--- a/compose3/preview/training.yml	Fri Apr 21 20:42:58 2017 +0100
+++ b/compose3/preview/training.yml	Mon Apr 24 15:20:17 2017 +0100
@@ -1,41 +1,34 @@
-usasdb:
-  restart: unless-stopped
-  image: docker.ssdt.io/trainingdb-usas
-  environment:
-    - DB_NAME=usasdb
-    - DB_USER=usas
-    - DB_PASS=usasdefault
-usasapp:
-  restart: unless-stopped
-  image: docker.ssdt.io/usas-app:preview
-  volumes:
-    - ${PWD}/config:/config
-  environment:
-    - DB_HOST=usas-database
-    - DB_NAME=usasdb
-    - DB_USER=usas
-    - DB_PASS=usasdefault
-    - JAVA_OPTS=-Xmx640m
-  links:
-    - usasdb:usas-database
-uspsdb:
-  restart: unless-stopped
-  image: docker.ssdt.io/trainingdb-usps
-  environment:
-    - DB_NAME=uspsdb
-    - DB_USER=usps
-    - DB_PASS=uspsdefault
-uspsapp:
-  restart: unless-stopped
-  image: docker.ssdt.io/usps-app:preview
-  volumes:
-    - ${PWD}/config:/config
-  environment:
-    - DB_HOST=usps-database
-    - DB_NAME=uspsdb
-    - DB_USER=usps
-    - DB_PASS=uspsdefault
-    - JAVA_OPTS=-Xmx640m
-  links:
-    - uspsdb:usps-database
-
+version: "3"
+services:
+  usasdb:
+    restart: unless-stopped
+    image: docker.ssdt.io/trainingdb-usas
+    environment:
+      - DB_NAME=usasdb
+      - DB_USER=usas
+      - DB_PASS=usasdefault
+  usasapp:
+    restart: unless-stopped
+    image: docker.ssdt.io/usas-app:preview
+    environment:
+      - DB_HOST=usasdb
+      - DB_NAME=usasdb
+      - DB_USER=usas
+      - DB_PASS=usasdefault
+      - JAVA_OPTS=-Xmx640m
+  uspsdb:
+    restart: unless-stopped
+    image: docker.ssdt.io/trainingdb-usps
+    environment:
+      - DB_NAME=uspsdb
+      - DB_USER=usps
+      - DB_PASS=uspsdefault
+  uspsapp:
+    restart: unless-stopped
+    image: docker.ssdt.io/usps-app:preview
+    environment:
+      - DB_HOST=uspsdb
+      - DB_NAME=uspsdb
+      - DB_USER=usps
+      - DB_PASS=uspsdefault
+      - JAVA_OPTS=-Xmx640m
--- a/compose3/preview/usas-template.yml	Fri Apr 21 20:42:58 2017 +0100
+++ b/compose3/preview/usas-template.yml	Mon Apr 24 15:20:17 2017 +0100
@@ -1,12 +1,12 @@
-version: "2"
+version: "3"
 services:
   usasdb:
     extends:
-      file: /ssdt/compose/preview/usas.yml
+      file: /ssdt/compose3/preview/usas.yml
       service: usasdb
     volumes:
       - |volumeName|:/var/lib/postgresql/data
   usasapp:
     extends:
-       file: /ssdt/compose/preview/usas.yml
+       file: /ssdt/compose3/preview/usas.yml
        service: usasapp
\ No newline at end of file
--- a/compose3/preview/usas.yml	Fri Apr 21 20:42:58 2017 +0100
+++ b/compose3/preview/usas.yml	Mon Apr 24 15:20:17 2017 +0100
@@ -1,4 +1,5 @@
-version: "2"
+# base compose file for usas Preview release
+version: "3"
 services:
   usasdb:
     restart: unless-stopped
@@ -6,7 +7,7 @@
     environment:
       - DB_NAME=usasdb
       - DB_USER=usas
-      - DB_PASS=usasdefault
+      - DB_PASS=${USAS_DB_PASSWORD:-usasdefault}
   usasapp:
     restart: unless-stopped
     image: docker.ssdt.io/usas-app:preview
@@ -14,7 +15,6 @@
       - DB_HOST=usasdb
       - DB_NAME=usasdb
       - DB_USER=usas
-      - DB_PASS=usasdefault
+      - DB_PASS=${USAS_DB_PASSWORD:-usasdefault}
       - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_SERVERHOST=uspsapp
-      - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_SERVERDNSLOOKUP=true
-      
+      - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_SERVERDNSLOOKUP=true
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compose3/preview/usps.template.yml	Mon Apr 24 15:20:17 2017 +0100
@@ -0,0 +1,12 @@
+version: "3"
+services:
+  uspsdb:
+    extends:
+      file: /ssdt/compose/preview/usps.yml
+      service: uspsdb
+    volumes:
+      - |volumeName|:/var/lib/postgresql/data
+  uspsapp:
+    extends:
+       file: /ssdt/compose/preview/usps.yml
+       service: uspsapp
\ No newline at end of file
--- a/compose3/preview/usps.yml	Fri Apr 21 20:42:58 2017 +0100
+++ b/compose3/preview/usps.yml	Mon Apr 24 15:20:17 2017 +0100
@@ -1,5 +1,5 @@
-# base compose file for usps Release Candidate release
-version: "2"
+# base compose file for usps Preview release
+version: "3"
 services:
   uspsdb:
     restart: unless-stopped
@@ -7,7 +7,7 @@
     environment:
       - DB_NAME=uspsdb
       - DB_USER=usps
-      - DB_PASS=uspsdefault
+      - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}
   uspsapp:
     restart: unless-stopped
     image: docker.ssdt.io/usps-app:preview
@@ -15,6 +15,6 @@
       - DB_HOST=uspsdb
       - DB_NAME=uspsdb
       - DB_USER=usps
-      - DB_PASS=uspsdefault
+      - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}
       - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_SERVERHOST=usasapp
       - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_SERVERDNSLOOKUP=true