27 Commits

Author SHA1 Message Date
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
c0c6dcd1ce remove share context; moving to acs-share-base 2020-12-26 13:51:23 -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
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
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
0f36dd1943 added minimum unconfigured ACS services to Docker Compose 2020-12-16 23:34:34 -05:00
b37611a67c base docker-compose with basic directory vars 2020-12-16 21:53:53 -05:00