31 Commits

Author SHA1 Message Date
942bce286d Merge branch 'ags-aims-enterprise' into dbp-aims 2021-04-02 10:28:01 -04:00
d75bdbc5c2 Merge remote-tracking branch 'origin/ags-frontend-enterprise' into dbp 2021-04-02 10:19:50 -04:00
d87935cd44 Merge branch 'acs-aims' into acs-aims-enterprise 2021-01-14 11:19:10 -05:00
25d0633fdb Merge branch 'aims' into acs-aims 2021-01-14 11:17:08 -05:00
44b6f26f4f updates after some acs-enterprise testing 2021-01-14 11:17:01 -05:00
af39f367b6 Merge branch 'acs-frontend-enterprise' into acs-aims-enterprise 2021-01-13 20:55:01 -05:00
7114bb5de1 Merge branch 'acs-adw-base' into acs-frontend-enterprise 2021-01-13 18:18:28 -05:00
5ea48c405f added host-based config 2021-01-13 18:14:24 -05:00
8aa7067286 Merge remote-tracking branch 'origin/acs-frontend-enterprise' into acs-aims-enterprise 2021-01-13 17:22:01 -05:00
77f2c5e0f1 Merge branch 'aims' into acs-aims 2021-01-13 17:15:32 -05:00
919d842d61 added identity service 2021-01-13 17:01:06 -05:00
f28c16c4fe initial aps base 2021-01-13 14:32:12 -05:00
5788051f22 Merge remote-tracking branch 'origin/acs-adw-base' into acs-frontend-enterprise 2021-01-13 11:36:13 -05:00
b534456065 Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise 2021-01-13 11:28:54 -05:00
a56556b596 Merge branch 'acs-base.proxy' into acs-sync-base.acs-base 2021-01-06 15:54:27 -05:00
0a0cb15580 Merge branch 'acs-base.proxy' into acs-adw-base.acs-base 2021-01-06 15:54:12 -05:00
9e2ce6b967 Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community 2021-01-06 12:29:24 -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
c2795cd76c Merge branch 'acs-backend-community.acs-lats-community' into acs-frontend-community.acs-backend-community 2020-12-25 23:40:53 -05:00
b1f3b14846 Merge branch 'acs-base.proxy' into acs-sync-base.acs-base 2020-12-25 23:37:08 -05:00
56492a45c8 Merge branch 'acs-base.proxy' into acs-adw-base.acs-base 2020-12-25 23:30:25 -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
0b507962fa added sync service config 2020-12-17 17:41:47 -05:00
ff5442c869 added share to nginx 2020-12-17 16:32:32 -05:00
f239550be7 Merge branch 'acs-base.proxy' into acs-adw-base.acs-base 2020-12-17 16:29:54 -05:00
46bbeeef30 fixed missed envvar 2020-12-17 16:29:36 -05:00
e5824d17e1 added adw to nginx 2020-12-17 16:28:54 -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