Mercurial > public > ssdt-docker
changeset 109:6ca3e22d50e4 feature/djs-DEP-12-docker
DEP-12: start conversion to v3
author | smith@nwoca.org |
---|---|
date | Fri, 21 Apr 2017 20:42:58 +0100 |
parents | b2b23cdaabcd |
children | 950df79a9d65 |
files | compose2/preview/import-usas.yml compose2/preview/import-usps.yml compose2/preview/training.yml compose2/preview/usas-template.yml compose2/preview/usas.yml compose2/preview/usps.yml 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.yml |
diffstat | 12 files changed, 117 insertions(+), 117 deletions(-) [+] |
line wrap: on
line diff
--- a/compose2/preview/import-usas.yml Fri Apr 21 20:42:18 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -version: "2" -services: - usasimport: - image: docker.ssdt.io/usas-import:preview - command: -i ${IMP_IRN} -u ${IMP_URL} -r ${IMP_PATH} - environment: - - 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
--- a/compose2/preview/import-usps.yml Fri Apr 21 20:42:18 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -version: "2" -services: - uspsimport: - image: docker.ssdt.io/usps-import:preview - command: -i ${IMP_IRN} -u ${IMP_URL} -r ${IMP_PATH} ${IMP_ANON} ${IMP_EM} - environment: - - DB_HOST=uspsdb - - DB_NAME=uspsdb - - DB_USER=usps - - DB_PASS=uspsdefault \ No newline at end of file
--- a/compose2/preview/training.yml Fri Apr 21 20:42:18 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -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 -
--- a/compose2/preview/usas-template.yml Fri Apr 21 20:42:18 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -version: "2" -services: - usasdb: - extends: - file: /ssdt/compose/preview/usas.yml - service: usasdb - volumes: - - |volumeName|:/var/lib/postgresql/data - usasapp: - extends: - file: /ssdt/compose/preview/usas.yml - service: usasapp \ No newline at end of file
--- a/compose2/preview/usas.yml Fri Apr 21 20:42:18 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -version: "2" -services: - usasdb: - restart: unless-stopped - image: docker.ssdt.io/ssdt-postgres:3 - 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 - - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_SERVERHOST=uspsapp - - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_SERVERDNSLOOKUP=true -
--- a/compose2/preview/usps.yml Fri Apr 21 20:42:18 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -# base compose file for usps Release Candidate release -version: "2" -services: - uspsdb: - restart: unless-stopped - image: docker.ssdt.io/ssdt-postgres:3 - 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 - - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_SERVERHOST=usasapp - - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_SERVERDNSLOOKUP=true
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/compose3/preview/import-usas.yml Fri Apr 21 20:42:58 2017 +0100 @@ -0,0 +1,14 @@ +version: "2" +services: + usasimport: + image: docker.ssdt.io/usas-import:preview + command: -i ${IMP_IRN} -u ${IMP_URL} -r ${IMP_PATH} + environment: + - 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/compose3/preview/import-usps.yml Fri Apr 21 20:42:58 2017 +0100 @@ -0,0 +1,10 @@ +version: "2" +services: + uspsimport: + image: docker.ssdt.io/usps-import:preview + command: -i ${IMP_IRN} -u ${IMP_URL} -r ${IMP_PATH} ${IMP_ANON} ${IMP_EM} + environment: + - DB_HOST=uspsdb + - DB_NAME=uspsdb + - DB_USER=usps + - DB_PASS=uspsdefault \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/compose3/preview/training.yml Fri Apr 21 20:42:58 2017 +0100 @@ -0,0 +1,41 @@ +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 +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/compose3/preview/usas-template.yml Fri Apr 21 20:42:58 2017 +0100 @@ -0,0 +1,12 @@ +version: "2" +services: + usasdb: + extends: + file: /ssdt/compose/preview/usas.yml + service: usasdb + volumes: + - |volumeName|:/var/lib/postgresql/data + usasapp: + extends: + file: /ssdt/compose/preview/usas.yml + service: usasapp \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/compose3/preview/usas.yml Fri Apr 21 20:42:58 2017 +0100 @@ -0,0 +1,20 @@ +version: "2" +services: + usasdb: + restart: unless-stopped + image: docker.ssdt.io/ssdt-postgres:3 + 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 + - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_SERVERHOST=uspsapp + - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_SERVERDNSLOOKUP=true +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/compose3/preview/usps.yml Fri Apr 21 20:42:58 2017 +0100 @@ -0,0 +1,20 @@ +# base compose file for usps Release Candidate release +version: "2" +services: + uspsdb: + restart: unless-stopped + image: docker.ssdt.io/ssdt-postgres:3 + 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 + - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_SERVERHOST=usasapp + - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_SERVERDNSLOOKUP=true