|
f73fdbb5ea
|
added volume to base shared file store config
|
2020-12-17 17:16:01 -05:00 |
|
|
1216469feb
|
Merge branch 'acs-lats-community.acs-community' into acs-search-lats-community.acs-lats-community
|
2020-12-17 16:48:32 -05:00 |
|
|
6a6dbdc798
|
set core-aio version
|
2020-12-17 16:48:13 -05:00 |
|
|
2ac3d013c9
|
Merge branch 'acs-search-community.acs-community' into acs-search-lats-community.acs-search-community
|
2020-12-17 16:43:44 -05:00 |
|
|
80a938d674
|
Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base
|
2020-12-17 16:42:16 -05:00 |
|
|
ddb535ab14
|
added legacy transform URLs
|
2020-12-17 16:40:02 -05:00 |
|
|
8be9a0749a
|
Merge branch 'acs-share-base.acs-base' into acs-share-community.acs-share-base
|
2020-12-17 16:37:05 -05:00 |
|
|
0bd09b8cbd
|
Merge branch 'acs-search-community.acs-community' into acs-share-community.acs-search-community
|
2020-12-17 16:36:31 -05:00 |
|
|
a7cacf8edc
|
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base
|
2020-12-17 16:35:44 -05:00 |
|
|
43d5686407
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2020-12-17 16:35:11 -05:00 |
|
|
e29e80b650
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-17 16:34:26 -05:00 |
|
|
331eda62fc
|
Merge branch 'acs-base.proxy' into acs-lats-base.acs-base
|
2020-12-17 16:33:23 -05:00 |
|
|
fbf7ca3678
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2020-12-17 16:32:50 -05:00 |
|
|
ff5442c869
|
added share to nginx
|
2020-12-17 16:32:32 -05:00 |
|
|
4cb5100065
|
Merge branch 'acs-base.proxy' into acs-share-base.acs-base
|
2020-12-17 16:31:16 -05:00 |
|
|
f239550be7
|
Merge branch 'acs-base.proxy' into acs-adw-base.acs-base
|
2020-12-17 16:29:54 -05:00 |
|
|
3b631bcd87
|
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
|
2020-12-17 16:29:45 -05:00 |
|
|
46bbeeef30
|
fixed missed envvar
|
2020-12-17 16:29:36 -05:00 |
|
|
e5824d17e1
|
added adw to nginx
|
2020-12-17 16:28:54 -05:00 |
|
|
5cd3530ef0
|
Merge branch 'acs-base.proxy' into acs-adw-base.acs-base
|
2020-12-17 16:26:50 -05:00 |
|
|
d6f1c99c79
|
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
|
2020-12-17 16:25:37 -05:00 |
|
|
6b0c103d75
|
added depends_on for proxy
|
2020-12-17 16:24:34 -05:00 |
|
|
6d35ffa551
|
Merge branch 'acs-base.acs-proxy' into acs-ats-base.acs-base
|
2020-12-17 16:21:14 -05:00 |
|
|
faee3aaa48
|
Merge branch 'acs-proxy.proxy' into acs-base.acs-proxy
|
2020-12-17 16:20:23 -05:00 |
|
|
beb87dd97a
|
Merge branch 'proxy.base' into acs-proxy.proxy
|
2020-12-17 16:20:12 -05:00 |
|
|
a42af25649
|
added port for localhost
|
2020-12-17 16:19:34 -05:00 |
|
|
6c739c5795
|
Merge branch 'acs-base.acs-proxy' into acs-ats-base.acs-base
|
2020-12-17 16:18:18 -05:00 |
|
|
db6a1e148c
|
Merge branch 'acs-proxy.proxy' into acs-base.acs-proxy
|
2020-12-17 16:16:57 -05:00 |
|
|
ab396f7656
|
changed version to 'acs'
|
2020-12-17 16:16:44 -05:00 |
|
|
b65d3d301f
|
Merge branch 'acs-proxy.proxy' into acs-base.acs-proxy
|
2020-12-17 16:16:07 -05:00 |
|
|
6332985ebd
|
removed proxy
|
2020-12-17 16:09:48 -05:00 |
|
|
010149e6b6
|
added platform config
|
2020-12-17 16:07:17 -05:00 |
|
|
f1df9c3217
|
initial nginx dynamic docker image config
|
2020-12-17 16:03:33 -05:00 |
|
|
055119eeb5
|
added share config
|
2020-12-17 14:24:15 -05:00 |
|
|
75df5099e9
|
Merge branch 'acs-share-base.acs-base' into acs-share-community.acs-share-base
|
2020-12-17 14:20:22 -05:00 |
|
|
69974eaeea
|
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base
|
2020-12-17 13:24:15 -05:00 |
|
|
82d6fd5c8a
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2020-12-17 13:22:28 -05:00 |
|
|
90e935a49e
|
minor fixes
|
2020-12-17 13:22:05 -05:00 |
|
|
6e32209824
|
Merge branch 'acs-base.base' into acs-community.acs-base
|
2020-12-17 13:20:59 -05:00 |
|
|
0bb3b7bb28
|
added service name reference to platform
|
2020-12-17 13:07:55 -05:00 |
|
|
f97b6b973b
|
Merge branch 'acs-base.base' into acs-lats-base.acs-base
|
2020-12-17 13:04:06 -05:00 |
|
|
63d1ee7ef9
|
changed service from solr6 to search; added service name variables
|
2020-12-17 13:03:32 -05:00 |
|
|
a081d5b5c8
|
Merge branch 'acs-base.base' into acs-search-base.acs-base
|
2020-12-17 12:56:03 -05:00 |
|
|
c084972d39
|
Merge branch 'acs-base.base' into acs-share-base.acs-base
|
2020-12-17 12:55:48 -05:00 |
|
|
b9fb8971dd
|
Merge branch 'acs-base.base' into acs-adw-base.acs-base
|
2020-12-17 12:48:57 -05:00 |
|
|
487a677f6f
|
added service referencing variables
|
2020-12-17 12:48:48 -05:00 |
|
|
0608045c1b
|
Merge branch 'acs-base.base' into acs-ats-base.acs-base
|
2020-12-17 12:46:35 -05:00 |
|
|
79a1644530
|
more corrections to service names and addressing additions
|
2020-12-17 12:46:24 -05:00 |
|
|
8296a96294
|
Merge branch 'acs-base.base' into acs-adw-base.acs-base
|
2020-12-17 12:38:18 -05:00 |
|
|
79ef1f5868
|
added depends_on for ATS
|
2020-12-17 12:37:10 -05:00 |
|