53 Commits

Author SHA1 Message Date
31eaf8c7c2 Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base 2020-12-26 15:11:03 -05:00
89ffe20aee added CSRF 2020-12-26 15:10:13 -05:00
14a4c09f4d Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base 2020-12-26 14:27:06 -05:00
f2ac689f85 Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2020-12-26 13:56:13 -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
2367651a7e added share context removed from acs-base 2020-12-26 13:52:17 -05:00
b8b267d4c5 Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2020-12-26 13:51:34 -05:00
c0c6dcd1ce remove share context; moving to acs-share-base 2020-12-26 13:51:23 -05:00
68fcb3cbef added proxy config to share 2020-12-26 11:20:42 -05:00
4381a2d350 Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2020-12-26 11:19:21 -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
b02204d996 remove alf-specific variables; renamed existing 2020-12-26 11:10:46 -05:00
6d396a640f added JDBC driver to base config 2020-12-26 11:06:07 -05:00
486ff23ce4 Merge remote-tracking branch 'home/acs-ext-share.acs-share-base' into acs-ext-share.acs-share-base 2020-12-26 00:01:32 -05:00
bdef8c6b7f Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base 2020-12-25 23:38:02 -05:00
4b9900a7fd Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2020-12-25 23:30:52 -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
b9f0597020 refactored JAR ext loading 2020-12-25 14:44:51 -05:00
18839c8019 enabled JAR extension loading 2020-12-25 14:39:01 -05:00
8a29bded24 fixed COPY for multiple files 2020-12-21 14:29:05 -05:00
cb04027103 fixed yaml format issue 2020-12-17 20:23:44 -05:00
893f9cf7a8 initial share extension framework 2020-12-17 19:39:36 -05:00
ff5442c869 added share to nginx 2020-12-17 16:32:32 -05:00
4cb5100065 Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2020-12-17 16:31:16 -05:00
46bbeeef30 fixed missed envvar 2020-12-17 16:29:36 -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
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
c084972d39 Merge branch 'acs-base.base' into acs-share-base.acs-base 2020-12-17 12:55:48 -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
72f7960369 Merge branch 'acs-base.base' into acs-share-base.acs-base 2020-12-16 23:56:30 -05:00
6c665fab04 added depends_on for the alfresco service 2020-12-16 23:55:56 -05:00
00e0a17249 added share to proxy 2020-12-16 23:42:47 -05:00
bfa65c999e added share unconfigured service 2020-12-16 23:40:20 -05:00