brian
a50c3da468
Merge branch 'acs-backend-enterprise' into ags-backend-enterprise
2021-04-02 09:14:39 -04:00
brian
f8638e7a26
Merge branch 'ags-enterprise' into ags-backend-enterprise
2021-04-02 09:14:38 -04:00
brian
4d584785ff
Merge branch 'ags' into ags-enterprise
2021-04-02 09:14:31 -04:00
brian
96987b7ff1
Merge branch 'acs-enterprise' into ags-enterprise
2021-04-02 09:14:31 -04:00
brian
b6f2befafb
Merge branch 'acs-ats-enterprise' into acs-backend-enterprise
2021-04-02 09:13:57 -04:00
brian
c11990900c
Merge branch 'acs-sync-base' into acs-backend-enterprise
2021-04-02 09:13:56 -04:00
brian
e07cea5ffa
Merge branch 'acs-search' into acs-backend-enterprise
2021-04-02 09:13:54 -04:00
brian
6e09a9c0c9
Merge branch 'acs' into ags
2021-04-02 09:13:52 -04:00
brian
29f4ca7c54
Merge branch 'acs-ats-base' into acs-ats-enterprise
2021-04-02 09:13:50 -04:00
brian
73fea3d13d
Merge branch 'acs-enterprise' into acs-ats-enterprise
2021-04-02 09:13:49 -04:00
brian
910cc2e2cb
Merge branch 'acs' into acs-enterprise
2021-04-02 09:13:44 -04:00
brian
99d39fa7f7
Merge branch 'acs-search-base' into acs-search
2021-04-02 09:13:42 -04:00
brian
1778fd04a4
Merge branch 'acs' into acs-search
2021-04-02 09:13:41 -04:00
brian
d616b9ef3a
Merge branch 'acs-base' into acs
2021-04-02 09:13:32 -04:00
brian
a72d43a6af
Merge branch 'acs-base' into acs-search-base
2021-04-02 09:13:30 -04:00
brian
f10722dec9
Merge branch 'acs-base' into acs-sync-base
2021-04-02 09:13:22 -04:00
39928d09fc
Merge branch 'ats-base' into acs-ats-base
2021-04-02 09:11:32 -04:00
9859e68fe8
Merge branch 'acs-base' into acs-ats-base
2021-04-02 09:11:22 -04:00
4dccd7892f
Merge branch 'base' into ats-base
2021-04-02 09:09:13 -04:00
6bce626075
Merge branch 'proxy' into acs-base
2021-04-02 08:42:43 -04:00
brian
eaa6f1025d
Merge branch 'acs-backend-enterprise' into ags-backend-enterprise
2021-01-13 17:38:37 -05:00
3b5fc8c096
fixed sync service config
2021-01-13 17:35:43 -05:00
c9075398cd
Merge branch 'acs-backend-enterprise' into ags-backend-enterprise
2021-01-13 11:17:17 -05:00
ac7e691100
Merge branch 'acs-sync-base' into acs-backend-enterprise
2021-01-13 11:09:18 -05:00
15ccb5642b
using proxy values for sync url
2021-01-13 09:59:21 -05:00
4349851dd9
Merge remote-tracking branch 'origin/acs-sync-base' into acs-backend-enterprise
2021-01-13 09:56:54 -05:00
4f5a939b71
Merge remote-tracking branch 'origin/acs-backend-enterprise' into ags-backend-enterprise
2021-01-13 09:47:53 -05:00
22b2583505
Merge branch 'acs-enterprise' into ags-enterprise
2021-01-13 09:45:50 -05:00
9b3ba22ca1
Merge branch 'acs-search.acs' into acs-backend-enterprise.acs-search
2021-01-06 16:33:19 -05:00
0999563353
Merge branch 'acs.acs-base' into ags.acs
2021-01-06 16:27:44 -05:00
2878298644
Merge branch 'acs-search-base.acs-base' into acs-search.acs-search-base
2021-01-06 16:26:04 -05:00
11bb8c62ed
Merge branch 'acs.acs-base' into acs-search.acs
2021-01-06 16:24:47 -05:00
76dc8c7ad9
Merge branch 'acs-ats-base.acs-base' into acs-ats-enterprise.acs-ats-base
2021-01-06 16:22:31 -05:00
b024fd8d7e
Merge branch 'ats-base.base' into acs-ats-base.ats-base
2021-01-06 16:21:36 -05:00
8a36f91d06
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
2021-01-06 16:15:41 -05:00
962817ba63
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
2021-01-06 15:56:25 -05:00
a56556b596
Merge branch 'acs-base.proxy' into acs-sync-base.acs-base
2021-01-06 15:54:27 -05:00
d3b41dcc46
Merge branch 'base' into ats-base.base
2021-01-06 15:53:29 -05:00
37de03317b
Merge branch 'acs-enterprise.acs-community' into acs-ats-enterprise.acs-enterprise
2021-01-06 15:40:03 -05:00
dc9fb0abfa
added license dir
2021-01-06 15:39:29 -05:00
68dc071342
configured ACS for ATS
2021-01-06 15:36:32 -05:00
78ec9c2a94
Merge branch 'ats-base.base' into acs-ats-enterprise.ats-base
2021-01-06 15:25:16 -05:00
cafee75cdc
set platform to v6.2.2.3
2021-01-06 15:21:05 -05:00
d70efc6943
parameterized AOS
2021-01-06 15:19:41 -05:00
295b0711b0
Merge branch 'acs-community.acs-base' into ags-community.acs-community
2021-01-06 12:24:10 -05:00
83db2b08dc
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
2021-01-06 12:23:18 -05:00
a3cb815dd1
Merge branch 'acs-base.proxy' into acs-community.acs-base
2021-01-06 12:22:27 -05:00
ebd6c503bd
Merge branch 'proxy.base' into acs-base.proxy
2021-01-06 12:21:58 -05:00
bc6a8539f3
switched platform to AGS (not AMP module distributed anymore)
2021-01-06 10:24:47 -05:00
b47583a716
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
2020-12-26 14:15:39 -05:00
fc9c26eac5
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
2020-12-26 14:02:30 -05:00
2715b3afea
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
2020-12-26 14:00:14 -05:00
55b70f1a36
Merge branch 'acs-base.proxy' into acs-community.acs-base
2020-12-26 13:58:15 -05:00
1d5624496d
renamed proxy variables to match changes to proxy branch
2020-12-26 13:55:19 -05:00
3a6b5c4850
Merge commit '817b062dfddd1035aa68554f55065c042607c482' into acs-base.proxy
2020-12-26 13:54:44 -05:00
c0c6dcd1ce
remove share context; moving to acs-share-base
2020-12-26 13:51:23 -05:00
253b7fd3f2
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base
2020-12-26 13:50:37 -05:00
9f75b4439d
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
2020-12-26 13:46:21 -05:00
3ac57ce7d1
Merge branch 'acs-base.proxy' into acs-community.acs-base
2020-12-26 13:37:05 -05:00
3cb24f7587
added proxy config to platform
2020-12-26 11:18:58 -05:00
6579a5a0c9
Merge branch 'proxy.base' into acs-base.proxy
2020-12-26 11:16:07 -05:00
1ead7a8d16
added alf-specific variables back to docker-compose env in the right branch
2020-12-26 11:13:00 -05:00
63aa212ccb
Merge branch 'proxy.base' into acs-base.proxy
2020-12-26 11:11:48 -05:00
6d396a640f
added JDBC driver to base config
2020-12-26 11:06:07 -05:00
520e211c11
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base
2020-12-25 23:38:58 -05:00
1635445cba
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
2020-12-25 23:38:36 -05:00
6ec4a797ca
Merge branch 'acs-base.proxy' into acs-community.acs-base
2020-12-25 23:38:22 -05:00
b1f3b14846
Merge branch 'acs-base.proxy' into acs-sync-base.acs-base
2020-12-25 23:37:08 -05:00
04f44ef280
Merge branch 'acs-base.proxy' into acs-ats-base.acs-base
2020-12-25 23:32:53 -05:00
0ed77985f0
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
2020-12-25 23:32:10 -05:00
9720bd7fa6
Merge branch 'proxy.base' into acs-base.proxy
2020-12-25 23:08:53 -05:00
ce9b143fb5
added ATS-only base config
2020-12-21 11:50:38 -05:00
1d0aa0c91e
fixed solr configuration on platform
2020-12-17 21:00:27 -05:00
7a005d16d7
Merge branch 'acs-min-community.acs-base' into acs-search-community.acs-min-community
2020-12-17 20:50:09 -05:00
60b5a8989b
changed from v6.2.2-RC1 to v6.2.0-ga
2020-12-17 20:42:54 -05:00
b762ba0ce1
Merge branch 'acs-community.acs-base' into acs-search-community.acs-community
2020-12-17 18:53:59 -05:00
c22af67a06
disabled jodconverter in platform
2020-12-17 18:53:34 -05:00
0b507962fa
added sync service config
2020-12-17 17:41:47 -05:00
f73fdbb5ea
added volume to base shared file store config
2020-12-17 17:16:01 -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
fbf7ca3678
Merge branch 'acs-base.proxy' into acs-search-base.acs-base
2020-12-17 16:32:50 -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
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
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
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
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
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
79ef1f5868
added depends_on for ATS
2020-12-17 12:37:10 -05:00
8c480402ed
Merge branch 'acs-base.base' into acs-ats-base.acs-base
2020-12-17 12:32:07 -05:00
5cfee3d18f
updated service names
2020-12-17 12:31:55 -05:00
8a5004ed74
Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-community
2020-12-17 12:29:33 -05:00
d0a62bfd24
Merge branch 'acs-base.base' into acs-community.acs-base
2020-12-16 23:57:29 -05:00
7cedfa4fa2
Merge branch 'acs-base.base' into acs-search-base.acs-base
2020-12-16 23:56:43 -05:00
6858d201c2
Merge branch 'acs-base.base' into acs-ats-base.acs-base
2020-12-16 23:56:08 -05:00
6c665fab04
added depends_on for the alfresco service
2020-12-16 23:55:56 -05:00
723f3ec954
configured for ACS community v6.2.2-RC1
2020-12-16 23:55:00 -05:00
dcb88c42ea
added minimum unconfigured search service
2020-12-16 23:44:46 -05:00
c1323a8171
added ATS minimum unconfigured services
2020-12-16 23:38:34 -05:00
0f36dd1943
added minimum unconfigured ACS services to Docker Compose
2020-12-16 23:34:34 -05:00