Commit Graph
20 Commits
Author SHA1 Message Date
brian.long 6bce626075 Merge branch 'proxy' into acs-base 2021-04-02 08:42:43 -04:00
brian.long 3d6aa1d4bc Merge branch 'base' into proxy 2021-04-02 08:41:45 -04:00
brian.long 91ad3afc0a removed external dir 2021-04-02 08:40:18 -04:00
brian.long 15ccb5642b using proxy values for sync url 2021-01-13 09:59:21 -05:00
brian.long a56556b596 Merge branch 'acs-base.proxy' into acs-sync-base.acs-base 2021-01-06 15:54:27 -05:00
brian.long ebd6c503bd Merge branch 'proxy.base' into acs-base.proxy 2021-01-06 12:21:58 -05:00
brian.long ac18d6d637 fixed host/protocol URL rewrites 2021-01-06 12:21:21 -05:00
brian.long 1d5624496d renamed proxy variables to match changes to proxy branch 2020-12-26 13:55:19 -05:00
brian.long 3a6b5c4850 Merge commit '817b062dfddd1035aa68554f55065c042607c482' into acs-base.proxy 2020-12-26 13:54:44 -05:00
brian.long 817b062dfd merged platform/share into single proxy 2020-12-26 13:54:31 -05:00
brian.long c0c6dcd1ce remove share context; moving to acs-share-base 2020-12-26 13:51:23 -05:00
brian.long 3cb24f7587 added proxy config to platform 2020-12-26 11:18:58 -05:00
brian.long 6579a5a0c9 Merge branch 'proxy.base' into acs-base.proxy 2020-12-26 11:16:07 -05:00
brian.long d6b7a879b1 added .env configurable platform/share context 2020-12-26 11:15:44 -05:00
brian.long 1ead7a8d16 added alf-specific variables back to docker-compose env in the right branch 2020-12-26 11:13:00 -05:00
brian.long 63aa212ccb Merge branch 'proxy.base' into acs-base.proxy 2020-12-26 11:11:48 -05:00
brian.long 5e618569bc Merge branch 'base' into proxy.base 2020-12-26 11:11:16 -05:00
brian.long b02204d996 remove alf-specific variables; renamed existing 2020-12-26 11:10:46 -05:00
brian.long 6d396a640f added JDBC driver to base config 2020-12-26 11:06:07 -05:00
brian.long b1f3b14846 Merge branch 'acs-base.proxy' into acs-sync-base.acs-base 2020-12-25 23:37:08 -05:00