Compare commits

...

322 Commits

Author SHA1 Message Date
3ee62a6f46 Merge branch 'ags-backend-enterprise' into ags-backend-enterprise-persist 2023-10-26 14:46:25 -04:00
077e49d6f7 Merge branch 'acs-backend-enterprise-persist' into ags-backend-enterprise-persist 2023-10-26 14:46:07 -04:00
1149792321 Merge branch 'ags-enterprise' into ags-backend-enterprise 2023-10-26 14:43:37 -04:00
d23afd274c Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2023-10-26 14:43:33 -04:00
c088f81a2b Merge branch 'acs-enterprise' into ags-enterprise 2023-10-26 14:42:48 -04:00
5fc2127922 Merge branch 'ags' into ags-enterprise 2023-10-26 14:42:39 -04:00
31a89f370d Merge branch 'acs' into ags 2023-10-26 14:41:42 -04:00
07071281a9 Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist 2023-10-26 14:35:31 -04:00
0949d12d8f Merge branch 'acs-search' into acs-backend-enterprise 2023-10-26 14:35:02 -04:00
1b23093930 Merge branch 'acs-ats-enterprise' into acs-backend-enterprise 2023-10-26 14:34:56 -04:00
91e13fa81a Merge branch 'acs-enterprise' into acs-ats-enterprise 2023-10-26 14:31:57 -04:00
c0878c27f0 Merge branch 'acs' into acs-enterprise 2023-10-26 14:28:44 -04:00
bae1c47984 Merge branch 'acs' into acs-search 2023-10-26 14:27:39 -04:00
df452d73a0 removed mem_limit from proxy 2023-10-26 14:13:48 -04:00
aa136e1f2f added license file README 2023-10-26 08:50:32 -04:00
2c414ceb6c Merge branch 'ags-backend-enterprise' into ags-backend-enterprise-persist 2023-10-25 22:28:13 -04:00
20609d3e0f Merge branch 'acs-backend-enterprise-persist' into ags-backend-enterprise-persist 2023-10-25 22:27:56 -04:00
61ef62ecb1 Merge branch 'ags-enterprise' into ags-backend-enterprise 2023-10-25 22:27:15 -04:00
5429c03548 Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2023-10-25 22:26:52 -04:00
fa90205f6f Merge branch 'ags' into ags-enterprise 2023-10-25 22:26:23 -04:00
3d4f0640ab Merge branch 'acs-enterprise' into ags-enterprise 2023-10-25 22:26:19 -04:00
8a53f02159 Merge branch 'acs' into ags 2023-10-25 22:23:25 -04:00
f6db89c22a Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist 2023-10-25 21:55:50 -04:00
b7bba65f41 Merge branch 'acs-backend-persist' into acs-backend-enterprise-persist 2023-10-25 21:55:22 -04:00
1f1e10cd9c Merge branch 'acs-sync-base' into acs-backend-enterprise 2023-10-25 21:53:02 -04:00
3202dc9e51 Merge branch 'acs-search' into acs-backend-enterprise 2023-10-25 21:52:34 -04:00
aa6c6e54b6 Merge branch 'acs-ats-enterprise' into acs-backend-enterprise 2023-10-25 21:51:52 -04:00
f5b11e4a48 Merge branch 'acs-ats-base' into acs-ats-enterprise 2023-10-25 21:50:29 -04:00
a52eb3403f Merge branch 'acs-enterprise' into acs-ats-enterprise 2023-10-25 21:49:34 -04:00
38b5f8dc36 Merge branch 'acs' into acs-enterprise 2023-10-25 21:47:34 -04:00
2d292ade40 Merge branch 'acs-persist' into acs-backend-persist 2023-10-25 21:46:53 -04:00
9af50009c1 Merge branch 'acs-backend' into acs-backend-persist 2023-10-25 21:46:36 -04:00
664a47f49c Merge branch 'acs-lats' into acs-backend 2023-10-25 21:45:51 -04:00
020c4822fd Merge branch 'acs-search' into acs-backend 2023-10-25 21:45:36 -04:00
105b34664a Merge branch 'acs-lats-base' into acs-lats 2023-10-25 21:43:40 -04:00
59c87eb302 added solr health check 2023-10-25 20:37:32 -04:00
8c875fe850 Merge branch 'acs-search-base' into acs-search 2023-10-25 20:30:58 -04:00
b17f702f05 Merge branch 'acs-base' into acs-ats-base 2023-10-25 20:26:08 -04:00
c3f695ae8b Merge branch 'ats-base' into acs-ats-base 2023-10-25 20:25:48 -04:00
415994f1f3 ATE AIO v4.0.0 2023-10-25 20:23:36 -04:00
9a93ec369c Merge branch 'acs-base' into acs-lats-base 2023-10-25 20:23:20 -04:00
81ca2ed038 ACS search 2.0.8.2 2023-10-25 20:21:21 -04:00
51b777c0c5 Merge branch 'acs-base' into acs-search-base 2023-10-25 20:19:55 -04:00
f5c4b00a02 ACS sync v3.9.0 2023-10-25 20:17:44 -04:00
9e4577222b Merge branch 'acs-base' into acs-sync-base 2023-10-25 20:16:30 -04:00
f7c664e7f4 Merge branch 'acs-base' into acs-persist 2023-10-25 20:14:48 -04:00
ef221d9c7a Merge branch 'acs-base' into acs 2023-10-25 20:11:38 -04:00
57af0a20b1 ACS v7.4.1.1 2023-10-25 20:11:15 -04:00
76e4287aa1 Merge branch 'proxy' into acs-base 2023-10-25 20:08:28 -04:00
2b14374993 updated ATS versions 2023-10-25 18:25:49 -04:00
a4cfbd0b14 Merge branch 'base' into ats-base 2023-10-25 18:18:30 -04:00
241a3e47ea Merge branch 'base' into proxy 2023-10-25 18:07:00 -04:00
a426d52a14 Merge branch 'ags-backend-enterprise' into ags-backend-enterprise-persist 2022-11-01 17:32:43 -04:00
7280fa0a3a Merge branch 'acs-backend-enterprise-persist' into ags-backend-enterprise-persist 2022-11-01 17:32:34 -04:00
6002fcaef2 Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2022-11-01 17:30:10 -04:00
66b3e49873 Merge branch 'ags-enterprise' into ags-backend-enterprise 2022-11-01 17:29:30 -04:00
4336b63b85 Merge branch 'acs-enterprise' into ags-enterprise 2022-11-01 17:23:04 -04:00
df0a91920b Merge branch 'ags' into ags-enterprise 2022-11-01 17:22:19 -04:00
18889ab89d Merge branch 'acs' into ags 2022-11-01 17:20:40 -04:00
c9b136e201 Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist 2022-11-01 16:54:08 -04:00
f139716d25 Merge branch 'acs-ats-enterprise' into acs-backend-enterprise 2022-11-01 16:52:44 -04:00
49d2647ab6 Merge branch 'acs-ats-base' into acs-ats-enterprise 2022-11-01 16:52:20 -04:00
04b394c31c Merge branch 'ats-base' into acs-ats-base 2022-11-01 16:51:54 -04:00
fbbed5946f fixed ASFS docker image path 2022-11-01 16:51:30 -04:00
d09c72702a Merge branch 'acs-backend-persist' into acs-backend-enterprise-persist 2022-11-01 16:49:30 -04:00
4a165744ee Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist 2022-11-01 16:47:54 -04:00
a24bf1b647 Merge branch 'acs-search-persist' into acs-backend-persist 2022-11-01 16:46:48 -04:00
6d56f610a7 Merge branch 'acs-backend' into acs-backend-persist 2022-11-01 16:46:14 -04:00
4748d0e7b6 Merge branch 'acs-persist' into acs-search-persist 2022-11-01 16:44:50 -04:00
299d2fe04d Merge branch 'acs-search-base' into acs-search-persist 2022-11-01 16:43:23 -04:00
8bc64cd881 Merge branch 'acs-search' into acs-backend-enterprise 2022-11-01 16:34:46 -04:00
9f0f5868bd Merge branch 'acs-sync-base' into acs-backend-enterprise 2022-11-01 16:33:37 -04:00
9b3ed9fbbd Merge branch 'acs-ats-enterprise' into acs-backend-enterprise 2022-11-01 16:31:02 -04:00
3283969431 Merge branch 'acs-ats-base' into acs-ats-enterprise 2022-11-01 16:29:43 -04:00
bc91054eeb Merge branch 'acs-enterprise' into acs-ats-enterprise 2022-11-01 16:28:26 -04:00
8fd11ed1d6 Merge branch 'acs' into acs-enterprise 2022-11-01 16:26:33 -04:00
c60e224a14 Merge branch 'acs-lats' into acs-backend 2022-11-01 16:17:27 -04:00
fc74faf57a Merge branch 'acs-search' into acs-backend 2022-11-01 16:16:59 -04:00
da933f2aa7 Merge branch 'acs' into acs-lats 2022-11-01 16:15:28 -04:00
10aa561c52 Merge branch 'acs-lats-base' into acs-lats 2022-11-01 16:11:15 -04:00
2dc64b23e4 parameterized LATS version 2022-11-01 16:09:56 -04:00
e9186dec84 Merge branch 'acs-base' into acs-lats-base 2022-11-01 16:08:01 -04:00
d556040909 Merge branch 'acs' into acs-search 2022-11-01 16:05:53 -04:00
64f85da579 Merge branch 'acs-search-base' into acs-search 2022-11-01 16:04:44 -04:00
831f1cb4f0 Merge branch 'acs-base' into acs-ats-base 2022-11-01 15:32:08 -04:00
0e5181d12a Merge branch 'ats-base' into acs-ats-base 2022-11-01 15:30:48 -04:00
f569d712e1 parameterize Docker image versions 2022-11-01 15:30:07 -04:00
ffac352049 Merge branch 'base' into ats-base 2022-11-01 15:11:57 -04:00
8a7d6d2016 Merge branch 'acs-base' into acs-persist 2022-11-01 15:09:25 -04:00
9899d03da9 parameterized ASIE version; enabled secret comms 2022-11-01 15:07:51 -04:00
5b4069427e Merge branch 'acs-base' into acs-search-base 2022-11-01 15:04:21 -04:00
b3a9145dd6 parameterized sync service version 2022-11-01 15:00:53 -04:00
08ce9f6cc8 Merge branch 'acs-base' into acs-sync-base 2022-11-01 14:57:20 -04:00
7511eba729 added memory limit 2022-11-01 14:54:47 -04:00
173de2375e Merge branch 'acs-base' into acs 2022-11-01 14:52:59 -04:00
8e3301877a parameterized docker image tags 2022-11-01 14:51:11 -04:00
8b4e45c2e2 Merge branch 'proxy' into acs-base 2022-11-01 14:49:06 -04:00
9e1a819e8b Merge branch 'base' into proxy 2022-11-01 14:48:11 -04:00
481e1bb38d Merge branch 'acs-base' into acs 2022-11-01 14:22:57 -04:00
29f254a68e updated to ACS v7.3.0 2022-11-01 14:19:58 -04:00
973f5f21fc Merge branch 'acs-backend-enterprise-persist' into ags-backend-enterprise-persist 2021-07-30 16:19:35 -04:00
35f671df5e Merge branch 'ags-backend-enterprise' into ags-backend-enterprise-persist 2021-07-30 16:19:27 -04:00
97ced2653d Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist 2021-07-30 16:14:38 -04:00
5b62436d30 Merge branch 'ags-enterprise' into ags-backend-enterprise 2021-07-30 16:13:32 -04:00
f66c710a6e Merge branch 'acs-backend-enterprise' into ags-backend-enterprise 2021-07-30 16:13:27 -04:00
e62b0838f2 Merge branch 'acs-backend' into acs-backend-persist 2021-07-30 16:12:48 -04:00
184c1bb158 Merge branch 'ags' into ags-enterprise 2021-07-30 16:11:27 -04:00
d0e042a9c1 Merge branch 'acs-enterprise' into ags-enterprise 2021-07-30 16:09:20 -04:00
3a2220d215 Merge branch 'acs-search' into acs-backend 2021-07-30 16:08:53 -04:00
f0713c90dd Merge branch 'acs-lats' into acs-backend 2021-07-30 16:08:47 -04:00
daf1d74b66 Merge branch 'acs-search' into acs-backend-enterprise 2021-07-30 16:05:57 -04:00
69b04183bb Merge branch 'acs-ats-enterprise' into acs-backend-enterprise 2021-07-30 16:05:42 -04:00
0662ca345f added ATS memory limit mins 2021-07-30 16:02:01 -04:00
874f04c305 Merge branch 'acs-enterprise' into acs-ats-enterprise 2021-07-30 15:59:59 -04:00
0332838752 updated ATE AIO memory limit min 2021-07-30 15:57:23 -04:00
35e15a1735 Merge branch 'acs' into acs-lats 2021-07-30 15:56:37 -04:00
da93d4ea48 increased AGS platform memory limit min 2021-07-30 15:55:53 -04:00
01a5d97ed7 Merge branch 'acs' into ags 2021-07-30 15:55:20 -04:00
ad948f3f08 Merge branch 'acs' into acs-enterprise 2021-07-30 15:54:12 -04:00
979924957c updated ASS memory limit min 2021-07-30 15:53:20 -04:00
2a4b61053d Merge branch 'acs' into acs-search 2021-07-30 15:52:35 -04:00
b8016f4ac7 updated ACS memory limits 2021-07-30 15:52:07 -04:00
brian
a2ef5824d3 Merge branch 'ags-backend-enterprise' into ags-backend-enterprise-persist 2021-04-02 09:21:26 -04:00
brian
08a800ab24 Merge branch 'acs-backend-enterprise-persist' into ags-backend-enterprise-persist 2021-04-02 09:21:25 -04:00
brian
230e7fcf5e Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist 2021-04-02 09:14:44 -04:00
brian
180e642ce3 Merge branch 'acs-backend-persist' into acs-backend-enterprise-persist 2021-04-02 09:14:43 -04:00
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
38def362f6 Merge branch 'acs-search-persist' into acs-backend-persist 2021-04-02 09:14:37 -04:00
brian
f3d3293e9e Merge branch 'acs-backend' into acs-backend-persist 2021-04-02 09:14:36 -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
456950f31d Merge branch 'acs-lats' into acs-backend 2021-04-02 09:14:29 -04:00
brian
6740f23779 Merge branch 'acs-search' into acs-backend 2021-04-02 09:14:28 -04:00
brian
880221a953 Merge branch 'acs-lats-base' into acs-lats 2021-04-02 09:14:00 -04:00
brian
398d6692f8 Merge branch 'acs' into acs-lats 2021-04-02 09:13:59 -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
2c82f844b1 Merge branch 'acs-search-base' into acs-search-persist 2021-04-02 09:13:47 -04:00
brian
b805fbbd1a Merge branch 'acs-persist' into acs-search-persist 2021-04-02 09:13:46 -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
b7c883068a Merge branch 'acs-base' into acs-persist 2021-04-02 09:13:27 -04:00
brian
5a16e389c4 Merge branch 'acs-base' into acs-lats-base 2021-04-02 09:13:25 -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
3d6aa1d4bc Merge branch 'base' into proxy 2021-04-02 08:41:45 -04:00
brian
9f004a7cc0 Merge branch 'ags-backend-enterprise' into ags-backend-enterprise-persist 2021-01-13 17:38:51 -05:00
brian
ed35fcae1d Merge branch 'acs-backend-enterprise-persist' into ags-backend-enterprise-persist 2021-01-13 17:38:48 -05:00
brian
a140d6806f Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist 2021-01-13 17:38:40 -05: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
e63cca79ce Merge branch 'acs-backend-enterprise-persist' into ags-backend-enterprise-persist 2021-01-13 11:41:27 -05:00
brian
3409eb4eec Merge branch 'acs-backend-enterprise' into acs-backend-enterprise-persist 2021-01-13 11:26:27 -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
c7378dd9c2 Merge branch 'acs-backend-persist.acs-backend' into acs-backend-enterprise-persist.acs-backend-persist 2021-01-06 16:43:39 -05:00
53404852e1 Merge branch 'acs-backend.acs-lats' into acs-backend-persist.acs-backend 2021-01-06 16:37:17 -05:00
75743d2391 Merge branch 'acs-search-persist.acs-persist' into acs-backend-persist.acs-search-persist 2021-01-06 16:36:22 -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
078b2ae35c Merge branch 'acs-lats.acs' into acs-backend.acs-lats 2021-01-06 16:27:31 -05:00
5ff71f0e3c Merge branch 'acs-search.acs' into acs-backend.acs-search 2021-01-06 16:27:17 -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
30f3420ee5 Merge branch 'acs-lats-base.acs-base' into acs-lats.acs-lats-base 2021-01-06 16:24:29 -05:00
677a3e1dc8 Merge branch 'acs.acs-base' into acs-lats.acs 2021-01-06 16:24:01 -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
2ec11a1135 Merge branch 'acs-base.proxy' into acs-lats-base.acs-base 2021-01-06 16:12:46 -05:00
6a8b1e2628 Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist 2021-01-06 16:11:47 -05:00
932159b238 Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base 2021-01-06 16:11:28 -05:00
962817ba63 Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2021-01-06 15:56:25 -05:00
135739da10 Merge branch 'acs-base.proxy' into acs-persist.acs-base 2021-01-06 15:56:03 -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
e660d79ef1 Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community 2021-01-06 12:23:49 -05:00
f036e13180 Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community 2021-01-06 12:23:35 -05:00
83db2b08dc Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2021-01-06 12:23:18 -05:00
40207d43ff Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community 2021-01-06 12:22:58 -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
ac18d6d637 fixed host/protocol URL rewrites 2021-01-06 12:21:21 -05:00
bc6a8539f3 switched platform to AGS (not AMP module distributed anymore) 2021-01-06 10:24:47 -05:00
02a2ec72c0 Merge branch 'acs-backend-community.acs-lats-community' into acs-backend-community-persist.acs-backend-community 2020-12-26 14:23:53 -05:00
41b87a9e5e Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community 2020-12-26 14:20:33 -05:00
86ad2bc409 Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community 2020-12-26 14:20:12 -05:00
2a56247aa1 Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base 2020-12-26 14:18:48 -05:00
efb9210c5a Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community 2020-12-26 14:18:31 -05:00
48d46aa70c Merge branch 'acs-base.proxy' into acs-lats-base.acs-base 2020-12-26 14:18:13 -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
720346e9d7 Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist 2020-12-26 14:01:13 -05:00
68e0652872 Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base 2020-12-26 14:00:56 -05:00
2715b3afea Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2020-12-26 14:00:14 -05:00
b81db4fc0f Merge branch 'acs-base.proxy' into acs-persist.acs-base 2020-12-26 13:59:41 -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
817b062dfd merged platform/share into single proxy 2020-12-26 13:54:31 -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
c377995a1d Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist 2020-12-26 13:48:22 -05:00
e223fd99a3 Merge commit '9f75b4439d19154e3aaa48e19d05451530333613' into acs-search-persist.acs-search-base 2020-12-26 13:47:30 -05:00
9f75b4439d Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2020-12-26 13:46:21 -05:00
5beadf9f35 Merge branch 'acs-base.proxy' into acs-persist.acs-base 2020-12-26 13:45:22 -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
d6b7a879b1 added .env configurable platform/share context 2020-12-26 11:15:44 -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
5e618569bc Merge branch 'base' into proxy.base 2020-12-26 11:11:16 -05:00
6d396a640f added JDBC driver to base config 2020-12-26 11:06:07 -05:00
24337f3a13 Merge branch 'acs-backend-community.acs-lats-community' into acs-backend-community-persist.acs-backend-community 2020-12-25 23:55:11 -05:00
04988e43dd Merge branch 'acs-search-persist.acs-persist' into acs-backend-community-persist.acs-search-persist 2020-12-25 23:54:43 -05:00
f94f3e82e8 Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base 2020-12-25 23:52:04 -05:00
cb5d306478 Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist 2020-12-25 23:51:38 -05:00
abaa41345a Merge branch 'acs-base.proxy' into acs-persist.acs-base 2020-12-25 23:51:17 -05:00
17f70ea253 Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community 2020-12-25 23:40:25 -05:00
2173a9eb5b Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community 2020-12-25 23:40:01 -05:00
8e1a7f11ca Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base 2020-12-25 23:39:36 -05:00
ca1eaa8bff Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community 2020-12-25 23:39:19 -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
32ad6d8195 Merge branch 'acs-base.proxy' into acs-lats-base.acs-base 2020-12-25 23:32:25 -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
4e8453becd removed port from reverse proxy; allows it to work when port changes 2020-12-25 23:08:07 -05:00
0488b3402d Merge branch 'acs-backend-community.acs-lats-community' into acs-backend-community-persist.acs-backend-community 2020-12-21 11:56:57 -05:00
ce9b143fb5 added ATS-only base config 2020-12-21 11:50:38 -05:00
fad6fe1c2a Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist 2020-12-17 21:33:18 -05:00
2789af0bd7 added persistence to activemq 2020-12-17 21:31:57 -05:00
91da0dedb6 Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base 2020-12-17 21:30:09 -05:00
8d3c4987f0 added persistence to platform/db 2020-12-17 21:26:03 -05:00
701489665a Merge branch 'acs-lats-community.acs-lats-base' into acs-backend-community.acs-lats-community 2020-12-17 21:03:07 -05:00
0976a3975f Merge branch 'acs-min-community.acs-base' into acs-lats-community.acs-min-community 2020-12-17 21:02:41 -05:00
0ad2cdf9ad Merge branch 'acs-search-community.acs-min-community' into acs-backend-community.acs-search-community 2020-12-17 21:01:06 -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
7bb62f421e Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community 2020-12-17 18:55:51 -05:00
f02d4ff427 Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community 2020-12-17 18:55:28 -05:00
1e09466e78 Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community 2020-12-17 18:54:28 -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
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
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
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
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
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
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
3fea801d26 added minimum local transform service 2020-12-17 00:01:13 -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
6 changed files with 256 additions and 0 deletions

15
.env
View File

@ -0,0 +1,15 @@
ALFRESCO_DIR=~/alfresco
ALFRESCO_LICENSE_DIR=~/alfresco/license
PROXY_PROTOCOL=http
PROXY_HOST=localhost
PROXY_PORT=8080
ACS_TAG=7.4.1.1
ATR_TAG=3.0.0
ATE_AIO_TAG=4.0.0
ASFS_TAG=3.0.0
AAMQ_TAG=latest
POSTGRES_TAG=13
ASIE_TAG=2.0.8.2
ALF_SYNC_SERV_TAG=3.9.0

View File

@ -3,3 +3,11 @@
This Git Repository intends to represent environments in Docker Compose. All environments are effectively a derivative of other environments. The original environment is the environment represented by the `base` branch. All derivative environments are represented by other branches. Those branches are named in the format `{core}.{parent}`. This Git Repository intends to represent environments in Docker Compose. All environments are effectively a derivative of other environments. The original environment is the environment represented by the `base` branch. All derivative environments are represented by other branches. Those branches are named in the format `{core}.{parent}`.
## Licensing
This version of Alfresco requires licensing.
### ACS Enterprise
The enterprise version of ACS requires a license file for it to work for more than 2 days. This means it isn't really required, but it is becomes important when you utilize any `persist` branch. For licensing to work, you must place your license file in the following directory relative to the user home directory that runs the Docker Compose command: `alfresco/license/acs`. There must be just one file in there that ends in `.lic`.

View File

@ -1,3 +1,157 @@
# Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml # Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
# #
version: "3" version: "3"
services:
platform:
image: quay.io/alfresco/alfresco-governance-repository-enterprise:${ACS_TAG}
environment:
JAVA_TOOL_OPTIONS: "
-Dencryption.keystore.type=JCEKS
-Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-Dencryption.keyAlgorithm=DESede
-Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore
-Dmetadata-keystore.password=mp6yc0UD9e
-Dmetadata-keystore.aliases=metadata
-Dmetadata-keystore.metadata.password=oKIWzVdEdA
-Dmetadata-keystore.metadata.algorithm=DESede
"
JAVA_OPTS: "
-Xms512m -Xmx1g
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
-Ddb.password=alfresco
-Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-Dindex.subsystem.name=solr6
-Dsolr.host=search
-Dsolr.secureComms=secret
-Dsolr.sharedSecret=alfresco-secret
-Dalfresco.host=${PROXY_HOST}
-Dalfresco.port=${PROXY_PORT}
-Dalfresco.protocol=${PROXY_PROTOCOL}
-Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-Dcsrf.filter.enabled=false
-Dcors.enabled=false
-Dtransform.service.enabled=true
-Dtransform.service.url=http://transform-router:8095
-Dsfs.url=http://shared-file-store:8099
-Dlocal.transform.service.enabled=true
-Dalfresco-pdf-renderer.url=http://transform-engine-aio:8090
-Djodconverter.url=http://transform-engine-aio:8090
-Dimg.url=http://transform-engine-aio:8090
-Dtika.url=http://transform-engine-aio:8090
-Dtransform.misc.url=http://transform-engine-aio:8090
-Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync
-Dsystem.content.eagerOrphanCleanup=true
-Dsystem.content.orphanProtectDays=0
-Djodconverter.enabled=false
"
depends_on:
- postgres-acs
- activemq
- shared-file-store
volumes:
- "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro"
- acsbin-volume:/usr/local/tomcat/alf_data:rw
transform-router:
image: quay.io/alfresco/alfresco-transform-router:${ATR_TAG}
environment:
ACTIVEMQ_URL: "nio://activemq:61616"
CORE_AIO_URL : "http://transform-core-aio:8090"
FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
depends_on:
- activemq
- shared-file-store
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
environment:
ACTIVEMQ_URL: "nio://activemq:61616"
FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
depends_on:
- activemq
- shared-file-store
shared-file-store:
image: quay.io/alfresco/alfresco-shared-file-store:${ASFS_TAG}
volumes:
- shared-file-store-volume:/tmp/Alfresco/sfs
postgres-acs:
image: postgres:${POSTGRES_TAG}
environment:
POSTGRES_PASSWORD: alfresco
POSTGRES_USER: alfresco
POSTGRES_DB: alfresco
command: postgres -c max_connections=300 -c log_min_messages=LOG
volumes:
- acsdb-volume:/var/lib/postgresql/data:rw
search:
image: alfresco/alfresco-search-services:${ASIE_TAG}
environment:
SOLR_ALFRESCO_HOST: platform
SOLR_SOLR_HOST: search
SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
ALFRESCO_SECURE_COMMS: secret
JAVA_TOOL_OPTIONS: "
-Dalfresco.secureComms.secret=alfresco-secret
"
healthcheck:
test: "curl -fsS http://localhost:8983/solr"
volumes:
- solrindex-volume:/opt/alfresco-search-services/data:rw
activemq:
image: alfresco/alfresco-activemq:${AAMQ_TAG}
environment:
ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
ACTIVEMQ_ADMIN_LOGIN: alfresco
ACTIVEMQ_ADMIN_PASSWORD: alfresco
volumes:
- activemq-volume:/opt/activemq/data:rw
sync:
image: quay.io/alfresco/service-sync:${ALF_SYNC_SERV_TAG}
environment:
JAVA_OPTS : "
-Xms64m -Xmx256m
-Dsql.db.driver=org.postgresql.Driver
-Dsql.db.url=jdbc:postgresql://postgres-acs:5432/alfresco
-Dsql.db.username=alfresco
-Dsql.db.password=alfresco
-Dmessaging.broker.host=activemq
-Drepo.hostname=platform
-Drepo.port=8080
-Ddw.server.applicationConnectors[0].type=http
"
depends_on:
- postgres-acs
- activemq
proxy:
build: ./nginx-ingress
image: local/nginx-ingress:acs-sync
ports:
- 8080:8080
depends_on:
- platform
- sync
volumes:
shared-file-store-volume:
driver_opts:
type: tmpfs
device: tmpfs
acsbin-volume:
driver: local
acsdb-volume:
driver: local
activemq-volume:
driver: local
solrindex-volume:
driver: local

8
nginx-ingress/Dockerfile Normal file
View File

@ -0,0 +1,8 @@
FROM nginx:stable-alpine
COPY nginx.conf /etc/nginx/nginx.conf
COPY entrypoint.sh /
RUN chmod +x /entrypoint.sh
ENTRYPOINT [ "/entrypoint.sh" ]

View File

@ -0,0 +1,15 @@
#!/bin/sh
if [[ $ACS_PLATFORM_URL ]]; then
sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
fi
if [[ $ACS_SYNC_URL ]]; then
sed -i s%http:\/\/sync:9090%"$ACS_SYNC_URL"%g /etc/nginx/nginx.conf
fi
if [[ $ACCESS_LOG ]]; then
sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
fi
nginx -g "daemon off;"

56
nginx-ingress/nginx.conf Normal file
View File

@ -0,0 +1,56 @@
worker_processes 1;
events {
worker_connections 1024;
}
http {
server {
listen *:8080;
client_max_body_size 0;
set $allowOriginSite *;
proxy_pass_request_headers on;
proxy_pass_header Set-Cookie;
# External settings, do not remove
#ENV_ACCESS_LOG
proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
proxy_redirect off;
proxy_buffering off;
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass_header Set-Cookie;
# Protect access to SOLR APIs
location ~ ^(/.*/service/api/solr/.*)$ {return 403;}
location ~ ^(/.*/s/api/solr/.*)$ {return 403;}
location ~ ^(/.*/wcservice/api/solr/.*)$ {return 403;}
location ~ ^(/.*/wcs/api/solr/.*)$ {return 403;}
location ~ ^(/.*/proxy/alfresco/api/solr/.*)$ {return 403 ;}
location ~ ^(/.*/-default-/proxy/alfresco/api/.*)$ {return 403;}
# Protect access to Prometheus endpoint
location ~ ^(/.*/s/prometheus)$ {return 403;}
location / {
proxy_pass http://platform:8080;
}
location /alfresco/ {
proxy_pass http://platform:8080;
# If using external proxy / load balancer (for initial redirect if no trailing slash)
absolute_redirect off;
}
location /sync/ {
proxy_pass http://sync:9090/alfresco/;
}
}
}