|
|
b1fd22349c
|
Merge branch 'acs' into acs-mysql
|
2023-11-01 14:23:32 -04:00 |
|
|
|
fbda2bcdde
|
configure CORS in ACS
|
2023-11-01 14:21:02 -04:00 |
|
|
|
57e5ee1da5
|
Merge branch 'acs' into acs-mysql
|
2023-10-26 14:40:48 -04:00 |
|
|
|
df452d73a0
|
removed mem_limit from proxy
|
2023-10-26 14:13:48 -04:00 |
|
|
|
291176c213
|
Merge branch 'acs-mysql-base' into acs-mysql
|
2023-10-25 22:19:31 -04:00 |
|
|
|
37e13d6252
|
Merge branch 'acs-base' into acs-mysql-base
|
2023-10-25 20:26:54 -04:00 |
|
|
|
ef221d9c7a
|
Merge branch 'acs-base' into acs
|
2023-10-25 20:11:38 -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 |
|
|
|
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 |
|
|
|
7511eba729
|
added memory limit
|
2022-11-01 14:54:47 -04:00 |
|
|
|
173de2375e
|
Merge branch 'acs-base' into acs
|
2022-11-01 14:52:59 -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 |
|
|
|
481e1bb38d
|
Merge branch 'acs-base' into acs
|
2022-11-01 14:22:57 -04:00 |
|
|
|
29f254a68e
|
updated to ACS v7.3.0
|
2022-11-01 14:19:58 -04:00 |
|
|
|
c5171fdb51
|
Merge branch 'acs' into acs-mysql
|
2021-07-30 15:58:15 -04:00 |
|
|
|
b8016f4ac7
|
updated ACS memory limits
acs-v6
|
2021-07-30 15:52:07 -04:00 |
|
brian
|
07e0d14f42
|
Merge branch 'acs-mysql-base' into acs-mysql
|
2021-04-02 09:14:14 -04:00 |
|
brian
|
94a2a3a259
|
Merge branch 'acs' into acs-mysql
|
2021-04-02 09:14:13 -04:00 |
|
brian
|
dc3e42c872
|
Merge branch 'acs-base' into acs-mysql-base
|
2021-04-02 09:13:36 -04:00 |
|
brian
|
d616b9ef3a
|
Merge branch 'acs-base' into acs
|
2021-04-02 09:13:32 -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 |
|
|
|
b59eae3b5f
|
Merge branch 'acs' into acs-mysql
|
2021-01-11 22:47:08 -05:00 |
|
|
|
dc3dd8ca74
|
Merge branch 'acs-mysql-base.acs-base' into acs-mysql.acs-mysql-base
|
2021-01-06 16:00:28 -05:00 |
|
|
|
ae7b02d6ea
|
Merge branch 'acs-base.proxy' into acs-mysql-base.acs-base
|
2021-01-06 15:56:41 -05:00 |
|
|
|
d70efc6943
|
parameterized AOS
|
2021-01-06 15:19:41 -05:00 |
|
|
|
a3cb815dd1
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2021-01-06 12:22:27 -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 |
|
|
|
82b58f638c
|
Merge branch 'acs-community.acs-base' into acs-mysql-community.acs-community
|
2020-12-26 13:58:35 -05:00 |
|
|
|
55b70f1a36
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-26 13:58:15 -05:00 |
|
|
|
5b65b4817e
|
Merge branch 'acs-base.proxy' into acs-mysql-base.acs-base
|
2020-12-26 13:57:17 -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 |
|
|
|
5a929f6317
|
Merge branch 'acs-community.acs-base' into acs-mysql-community.acs-community
|
2020-12-26 13:39:03 -05:00 |
|
|
|
3ac57ce7d1
|
Merge branch 'acs-base.proxy' into acs-community.acs-base
|
2020-12-26 13:37:05 -05:00 |
|
|
|
f66e9aa1e8
|
replaced postgresql with mysql
|
2020-12-26 11:25:37 -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 |
|
