75 Commits

Author SHA1 Message Date
b17f702f05 Merge branch 'acs-base' into acs-ats-base 2023-10-25 20:26:08 -04:00
c3f695ae8b Merge branch 'ats-base' into acs-ats-base 2023-10-25 20:25:48 -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
2b14374993 updated ATS versions 2023-10-25 18:25:49 -04:00
a4cfbd0b14 Merge branch 'base' into ats-base 2023-10-25 18:18:30 -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
04b394c31c Merge branch 'ats-base' into acs-ats-base 2022-11-01 16:51:54 -04:00
fbbed5946f fixed ASFS docker image path 2022-11-01 16:51:30 -04:00
831f1cb4f0 Merge branch 'acs-base' into acs-ats-base 2022-11-01 15:32:08 -04:00
0e5181d12a Merge branch 'ats-base' into acs-ats-base 2022-11-01 15:30:48 -04:00
f569d712e1 parameterize Docker image versions 2022-11-01 15:30:07 -04:00
ffac352049 Merge branch 'base' into ats-base 2022-11-01 15:11:57 -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
29f254a68e updated to ACS v7.3.0 2022-11-01 14:19:58 -04:00
39928d09fc Merge branch 'ats-base' into acs-ats-base 2021-04-02 09:11:32 -04:00
9859e68fe8 Merge branch 'acs-base' into acs-ats-base 2021-04-02 09:11:22 -04:00
4dccd7892f Merge branch 'base' into ats-base 2021-04-02 09:09:13 -04:00
6bce626075 Merge branch 'proxy' into acs-base acs-base-v6 2021-04-02 08:42:43 -04:00
3d6aa1d4bc Merge branch 'base' into proxy 2021-04-02 08:41:45 -04:00
91ad3afc0a removed external dir 2021-04-02 08:40:18 -04:00
b024fd8d7e Merge branch 'ats-base.base' into acs-ats-base.ats-base 2021-01-06 16:21:36 -05:00
8a36f91d06 Merge branch 'acs-base.proxy' into acs-ats-base.acs-base 2021-01-06 16:15:41 -05:00
d3b41dcc46 Merge branch 'base' into ats-base.base 2021-01-06 15:53:29 -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
b47583a716 Merge branch 'acs-base.proxy' into acs-ats-base.acs-base 2020-12-26 14:15:39 -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
c0c6dcd1ce remove share context; moving to acs-share-base 2020-12-26 13:51:23 -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
04f44ef280 Merge branch 'acs-base.proxy' into acs-ats-base.acs-base 2020-12-25 23:32:53 -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
ce9b143fb5 added ATS-only base config 2020-12-21 11:50:38 -05:00
f73fdbb5ea added volume to base shared file store config 2020-12-17 17:16:01 -05:00
3b631bcd87 Merge branch 'acs-base.proxy' into acs-ats-base.acs-base 2020-12-17 16:29:45 -05:00
46bbeeef30 fixed missed envvar 2020-12-17 16:29:36 -05:00