 brian.long
|
39928d09fc
|
Merge branch 'ats-base' into acs-ats-base
|
2021-04-02 09:11:32 -04:00 |
|
|
brian.long
|
9859e68fe8
|
Merge branch 'acs-base' into acs-ats-base
|
2021-04-02 09:11:22 -04:00 |
|
|
brian.long
|
4dccd7892f
|
Merge branch 'base' into ats-base
|
2021-04-02 09:09:13 -04:00 |
|
|
brian.long
|
6bce626075
|
Merge branch 'proxy' into acs-base
acs-base-v6
|
2021-04-02 08:42:43 -04:00 |
|
|
brian.long
|
3d6aa1d4bc
|
Merge branch 'base' into proxy
|
2021-04-02 08:41:45 -04:00 |
|
|
brian.long
|
91ad3afc0a
|
removed external dir
|
2021-04-02 08:40:18 -04:00 |
|
|
brian.long
|
b024fd8d7e
|
Merge branch 'ats-base.base' into acs-ats-base.ats-base
|
2021-01-06 16:21:36 -05:00 |
|
|
brian.long
|
8a36f91d06
|
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
|
2021-01-06 16:15:41 -05:00 |
|
|
brian.long
|
d3b41dcc46
|
Merge branch 'base' into ats-base.base
|
2021-01-06 15:53:29 -05:00 |
|
|
brian.long
|
ebd6c503bd
|
Merge branch 'proxy.base' into acs-base.proxy
|
2021-01-06 12:21:58 -05:00 |
|
|
brian.long
|
ac18d6d637
|
fixed host/protocol URL rewrites
|
2021-01-06 12:21:21 -05:00 |
|
|
brian.long
|
b47583a716
|
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
|
2020-12-26 14:15:39 -05:00 |
|
|
brian.long
|
1d5624496d
|
renamed proxy variables to match changes to proxy branch
|
2020-12-26 13:55:19 -05:00 |
|
|
brian.long
|
3a6b5c4850
|
Merge commit '817b062dfddd1035aa68554f55065c042607c482' into acs-base.proxy
|
2020-12-26 13:54:44 -05:00 |
|
|
brian.long
|
817b062dfd
|
merged platform/share into single proxy
|
2020-12-26 13:54:31 -05:00 |
|
|
brian.long
|
c0c6dcd1ce
|
remove share context; moving to acs-share-base
|
2020-12-26 13:51:23 -05:00 |
|
|
brian.long
|
3cb24f7587
|
added proxy config to platform
|
2020-12-26 11:18:58 -05:00 |
|
|
brian.long
|
6579a5a0c9
|
Merge branch 'proxy.base' into acs-base.proxy
|
2020-12-26 11:16:07 -05:00 |
|
|
brian.long
|
d6b7a879b1
|
added .env configurable platform/share context
|
2020-12-26 11:15:44 -05:00 |
|
|
brian.long
|
1ead7a8d16
|
added alf-specific variables back to docker-compose env in the right branch
|
2020-12-26 11:13:00 -05:00 |
|
|
brian.long
|
63aa212ccb
|
Merge branch 'proxy.base' into acs-base.proxy
|
2020-12-26 11:11:48 -05:00 |
|
|
brian.long
|
5e618569bc
|
Merge branch 'base' into proxy.base
|
2020-12-26 11:11:16 -05:00 |
|
|
brian.long
|
b02204d996
|
remove alf-specific variables; renamed existing
|
2020-12-26 11:10:46 -05:00 |
|
|
brian.long
|
6d396a640f
|
added JDBC driver to base config
|
2020-12-26 11:06:07 -05:00 |
|
|
brian.long
|
04f44ef280
|
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
|
2020-12-25 23:32:53 -05:00 |
|
|
brian.long
|
9720bd7fa6
|
Merge branch 'proxy.base' into acs-base.proxy
|
2020-12-25 23:08:53 -05:00 |
|
|
brian.long
|
4e8453becd
|
removed port from reverse proxy; allows it to work when port changes
|
2020-12-25 23:08:07 -05:00 |
|
|
brian.long
|
ce9b143fb5
|
added ATS-only base config
|
2020-12-21 11:50:38 -05:00 |
|
|
brian.long
|
f73fdbb5ea
|
added volume to base shared file store config
|
2020-12-17 17:16:01 -05:00 |
|
|
brian.long
|
3b631bcd87
|
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
|
2020-12-17 16:29:45 -05:00 |
|
|
brian.long
|
46bbeeef30
|
fixed missed envvar
|
2020-12-17 16:29:36 -05:00 |
|
|
brian.long
|
d6f1c99c79
|
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
|
2020-12-17 16:25:37 -05:00 |
|
|
brian.long
|
6b0c103d75
|
added depends_on for proxy
|
2020-12-17 16:24:34 -05:00 |
|
|
brian.long
|
6d35ffa551
|
Merge branch 'acs-base.acs-proxy' into acs-ats-base.acs-base
|
2020-12-17 16:21:14 -05:00 |
|
|
brian.long
|
faee3aaa48
|
Merge branch 'acs-proxy.proxy' into acs-base.acs-proxy
|
2020-12-17 16:20:23 -05:00 |
|
|
brian.long
|
beb87dd97a
|
Merge branch 'proxy.base' into acs-proxy.proxy
|
2020-12-17 16:20:12 -05:00 |
|
|
brian.long
|
a42af25649
|
added port for localhost
|
2020-12-17 16:19:34 -05:00 |
|
|
brian.long
|
6c739c5795
|
Merge branch 'acs-base.acs-proxy' into acs-ats-base.acs-base
|
2020-12-17 16:18:18 -05:00 |
|
|
brian.long
|
db6a1e148c
|
Merge branch 'acs-proxy.proxy' into acs-base.acs-proxy
|
2020-12-17 16:16:57 -05:00 |
|
|
brian.long
|
ab396f7656
|
changed version to 'acs'
|
2020-12-17 16:16:44 -05:00 |
|
|
brian.long
|
b65d3d301f
|
Merge branch 'acs-proxy.proxy' into acs-base.acs-proxy
|
2020-12-17 16:16:07 -05:00 |
|
|
brian.long
|
6332985ebd
|
removed proxy
|
2020-12-17 16:09:48 -05:00 |
|
|
brian.long
|
010149e6b6
|
added platform config
|
2020-12-17 16:07:17 -05:00 |
|
|
brian.long
|
f1df9c3217
|
initial nginx dynamic docker image config
|
2020-12-17 16:03:33 -05:00 |
|
|
brian.long
|
487a677f6f
|
added service referencing variables
|
2020-12-17 12:48:48 -05:00 |
|
|
brian.long
|
0608045c1b
|
Merge branch 'acs-base.base' into acs-ats-base.acs-base
|
2020-12-17 12:46:35 -05:00 |
|
|
brian.long
|
79a1644530
|
more corrections to service names and addressing additions
|
2020-12-17 12:46:24 -05:00 |
|
|
brian.long
|
79ef1f5868
|
added depends_on for ATS
|
2020-12-17 12:37:10 -05:00 |
|
|
brian.long
|
8c480402ed
|
Merge branch 'acs-base.base' into acs-ats-base.acs-base
|
2020-12-17 12:32:07 -05:00 |
|
|
brian.long
|
5cfee3d18f
|
updated service names
|
2020-12-17 12:31:55 -05:00 |
|