50 Commits

Author SHA1 Message Date
de1b8a0bcc Merge branch 'aps-search' into aps-search-persist 2023-10-26 14:20:24 -04:00
73424b9bd9 Merge branch 'aps' into aps-search 2023-10-26 14:17:06 -04:00
6aa3731165 removed mem_limit from proxy 2023-10-26 14:14:26 -04:00
32255b7f48 added elasticsearch persistence 2023-10-25 19:31:15 -04:00
607590c1dd Merge branch 'aps-search' into aps-search-persist 2023-10-25 19:30:12 -04:00
bf4879e466 Merge branch 'aps-persist-base' into aps-persist 2023-10-25 18:50:49 -04:00
3a6d3b1c1e Merge branch 'aps-base' into aps-persist-base 2023-10-25 18:49:43 -04:00
944397b02c removed aps-search 2023-10-25 18:48:58 -04:00
7fedfed6cd Merge branch 'aps-search-base' into aps-search 2023-10-25 18:46:54 -04:00
eb8df1a86f fixed aps-search dependency 2023-10-25 18:46:40 -04:00
e30247ead5 Merge branch 'aps-search-base' into aps-search 2023-10-25 18:45:34 -04:00
8901d10f82 Merge branch 'aps-base' into aps 2023-10-25 18:39:33 -04:00
3fee42cd28 elasticsearch v.7.17.13 2023-10-25 18:37:26 -04:00
25e6137de9 Revert "removed elasticsearch"
This reverts commit fc8a854920c3de90d93c9055393845a5ab722f46.
2023-10-25 18:34:37 -04:00
fc8a854920 removed elasticsearch 2023-10-25 18:32:39 -04:00
7e526e0e1e Merge branch 'proxy' into aps-base 2023-10-25 18:29: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
17738d0a96 Merge branch 'aps' into aps-persist 2022-11-01 17:17:46 -04:00
64708232c4 Merge branch 'aps-persist-base' into aps-persist 2022-11-01 17:17:08 -04:00
4e85d8118c fixed APS license location 2022-11-01 17:14:49 -04:00
1279c5aeba Merge branch 'aps-base' into aps 2022-11-01 17:09:22 -04:00
3c1796b0b4 Merge branch 'aps-base' into aps-persist-base 2022-11-01 17:06:51 -04:00
dd967a17f2 parameterized APS versions 2022-11-01 17:06:07 -04:00
27a818fd22 Merge branch 'proxy' into aps-base 2022-11-01 17:00:56 -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
604ed69bb3 Merge branch 'aps' into aps-persist 2021-07-30 16:33:24 -04:00
dee72646e6 updated APS memory limit mins 2021-07-30 16:32:57 -04:00
2ed89fa708 Merge branch 'aps-persist-base' into aps-persist 2021-04-19 08:27:38 -04:00
bcdd5e0525 Merge branch 'aps-base' into aps-persist-base 2021-04-19 08:26:57 -04:00
7590f2d390 Merge branch 'aps-base' into aps 2021-04-19 08:26:27 -04:00
2d91d8bc08 renamed proxy from acs to aps 2021-04-19 08:26:13 -04:00
912249c388 Merge branch 'aps-base' into aps-persist-base 2021-01-13 16:19:26 -05:00
20b41bbcb1 corrected misspelling 2021-01-13 15:39:02 -05:00
6edb220093 Merge branch 'aps-persist-base' into aps-persist 2021-01-13 15:38:37 -05:00
8ccf85d170 Merge branch 'aps-base' into aps-persist-base 2021-01-13 15:37:41 -05:00
a2619fac7b fixed license directory var 2021-01-13 15:37:06 -05:00
d7ed2df85e moved store 2021-01-13 15:35:30 -05:00
16aa444b19 removed excess file mapping 2021-01-13 15:32:03 -05:00
7caee29b23 added persistence volumes 2021-01-13 15:30:34 -05:00
deb6bf058c Merge branch 'aps-base' into aps 2021-01-13 15:23:44 -05:00
8a0ccc61a5 backported some stuff from aps to aps-base 2021-01-13 15:22:30 -05:00
695e3b3dc0 fixed after testing 2021-01-13 15:20:03 -05:00
2b7755222b added versions and config to APS 2021-01-13 14:42:41 -05:00
237a8abd62 fixed proxy depends_on 2021-01-13 14:33:11 -05:00
f28c16c4fe initial aps base 2021-01-13 14:32:12 -05:00
a42af25649 added port for localhost 2020-12-17 16:19:34 -05:00
f1df9c3217 initial nginx dynamic docker image config 2020-12-17 16:03:33 -05:00
b37611a67c base docker-compose with basic directory vars 2020-12-16 21:53:53 -05:00