54 Commits

Author SHA1 Message Date
b1fd22349c Merge branch 'acs' into acs-mysql 2023-11-01 14:23:32 -04:00
fbda2bcdde configure CORS in ACS 2023-11-01 14:21:02 -04:00
57e5ee1da5 Merge branch 'acs' into acs-mysql 2023-10-26 14:40:48 -04:00
df452d73a0 removed mem_limit from proxy 2023-10-26 14:13:48 -04:00
291176c213 Merge branch 'acs-mysql-base' into acs-mysql 2023-10-25 22:19:31 -04:00
37e13d6252 Merge branch 'acs-base' into acs-mysql-base 2023-10-25 20:26:54 -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
241a3e47ea Merge branch 'base' into proxy 2023-10-25 18:07:00 -04:00
c2a9679ede update comment 2023-10-25 18:05:39 -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
10e7f81163 advancing to docker v3 2022-11-01 14:46:58 -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
c5171fdb51 Merge branch 'acs' into acs-mysql 2021-07-30 15:58:15 -04:00
b8016f4ac7 updated ACS memory limits 2021-07-30 15:52:07 -04:00
b59eae3b5f Merge branch 'acs' into acs-mysql 2021-01-11 22:47:08 -05:00
d70efc6943 parameterized AOS 2021-01-06 15:19:41 -05:00
82b58f638c Merge branch 'acs-community.acs-base' into acs-mysql-community.acs-community 2020-12-26 13:58:35 -05:00
55b70f1a36 Merge branch 'acs-base.proxy' into acs-community.acs-base 2020-12-26 13:58:15 -05:00
5b65b4817e Merge branch 'acs-base.proxy' into acs-mysql-base.acs-base 2020-12-26 13:57:17 -05:00
1d5624496d renamed proxy variables to match changes to proxy branch 2020-12-26 13:55:19 -05:00
c0c6dcd1ce remove share context; moving to acs-share-base 2020-12-26 13:51:23 -05:00
5a929f6317 Merge branch 'acs-community.acs-base' into acs-mysql-community.acs-community 2020-12-26 13:39:03 -05:00
3ac57ce7d1 Merge branch 'acs-base.proxy' into acs-community.acs-base 2020-12-26 13:37:05 -05:00
f66e9aa1e8 replaced postgresql with mysql 2020-12-26 11:25:37 -05:00
3cb24f7587 added proxy config to platform 2020-12-26 11:18:58 -05:00
6d396a640f added JDBC driver to base config 2020-12-26 11:06:07 -05:00
60b5a8989b changed from v6.2.2-RC1 to v6.2.0-ga 2020-12-17 20:42:54 -05:00
c22af67a06 disabled jodconverter in platform 2020-12-17 18:53:34 -05:00
e29e80b650 Merge branch 'acs-base.proxy' into acs-community.acs-base 2020-12-17 16:34:26 -05:00
6b0c103d75 added depends_on for proxy 2020-12-17 16:24:34 -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
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
f1df9c3217 initial nginx dynamic docker image config 2020-12-17 16:03:33 -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
79a1644530 more corrections to service names and addressing additions 2020-12-17 12:46:24 -05:00
5cfee3d18f updated service names 2020-12-17 12:31:55 -05:00
d0a62bfd24 Merge branch 'acs-base.base' into acs-community.acs-base 2020-12-16 23:57:29 -05:00