 brian.long
|
3ac57ce7d1
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-26 13:37:05 -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
|
520e211c11
|
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base
|
2020-12-25 23:38:58 -05:00 |
|
|
brian.long
|
1635445cba
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2020-12-25 23:38:36 -05:00 |
|
|
brian.long
|
6ec4a797ca
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-25 23:38:22 -05:00 |
|
|
brian.long
|
b1f3b14846
|
Merge branch 'acs-base.proxy' into acs-sync-base.acs-base
|
2020-12-25 23:37:08 -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
|
0ed77985f0
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2020-12-25 23:32:10 -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
|
1d0aa0c91e
|
fixed solr configuration on platform
|
2020-12-17 21:00:27 -05:00 |
|
|
brian.long
|
7a005d16d7
|
Merge branch 'acs-min-community.acs-base' into acs-search-community.acs-min-community
|
2020-12-17 20:50:09 -05:00 |
|
|
brian.long
|
60b5a8989b
|
changed from v6.2.2-RC1 to v6.2.0-ga
|
2020-12-17 20:42:54 -05:00 |
|
|
brian.long
|
b762ba0ce1
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2020-12-17 18:53:59 -05:00 |
|
|
brian.long
|
c22af67a06
|
disabled jodconverter in platform
|
2020-12-17 18:53:34 -05:00 |
|
|
brian.long
|
0b507962fa
|
added sync service config
|
2020-12-17 17:41:47 -05:00 |
|
|
brian.long
|
f73fdbb5ea
|
added volume to base shared file store config
|
2020-12-17 17:16:01 -05:00 |
|
|
brian.long
|
a7cacf8edc
|
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base
|
2020-12-17 16:35:44 -05:00 |
|
|
brian.long
|
43d5686407
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2020-12-17 16:35:11 -05:00 |
|
|
brian.long
|
e29e80b650
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-17 16:34:26 -05:00 |
|
|
brian.long
|
fbf7ca3678
|
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
|
2020-12-17 16:32:50 -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
|
69974eaeea
|
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base
|
2020-12-17 13:24:15 -05:00 |
|
|
brian.long
|
82d6fd5c8a
|
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
|
2020-12-17 13:22:28 -05:00 |
|
|
brian.long
|
90e935a49e
|
minor fixes
|
2020-12-17 13:22:05 -05:00 |
|
|
brian.long
|
6e32209824
|
Merge branch 'acs-base.base' into acs-community.acs-base
|
2020-12-17 13:20:59 -05:00 |
|
|
brian.long
|
63d1ee7ef9
|
changed service from solr6 to search; added service name variables
|
2020-12-17 13:03:32 -05:00 |
|
|
brian.long
|
a081d5b5c8
|
Merge branch 'acs-base.base' into acs-search-base.acs-base
|
2020-12-17 12:56:03 -05:00 |
|