Compare commits

..
Author SHA1 Message Date
brian.long 6178fe93b0 Merge branch 'acs-backend' into acs-backend-persist 2023-11-01 14:25:45 -04:00
brian.long faa633c46c Merge branch 'acs-lats' into acs-backend 2023-11-01 14:25:01 -04:00
brian.long 72026e2ad2 Merge branch 'acs-search' into acs-backend 2023-11-01 14:24:57 -04:00
brian.long ab44e01638 Merge branch 'acs' into acs-lats 2023-11-01 14:23:23 -04:00
brian.long b3c89aa9ce Merge branch 'acs' into acs-search 2023-11-01 14:23:12 -04:00
brian.long fbda2bcdde configure CORS in ACS 2023-11-01 14:21:02 -04:00
brian.long 9f059b6c13 Merge branch 'acs-backend' into acs-backend-persist 2023-10-26 14:30:42 -04:00
brian.long 0b18c583da Merge branch 'acs-lats' into acs-backend 2023-10-26 14:29:07 -04:00
brian.long 40dd43068d Merge branch 'acs-search' into acs-backend 2023-10-26 14:29:04 -04:00
brian.long 231f11ea05 Merge branch 'acs' into acs-lats 2023-10-26 14:28:24 -04:00
brian.long bae1c47984 Merge branch 'acs' into acs-search 2023-10-26 14:27:39 -04:00
brian.long df452d73a0 removed mem_limit from proxy 2023-10-26 14:13:48 -04:00
brian.long 2d292ade40 Merge branch 'acs-persist' into acs-backend-persist 2023-10-25 21:46:53 -04:00
brian.long 9af50009c1 Merge branch 'acs-backend' into acs-backend-persist 2023-10-25 21:46:36 -04:00
brian.long 664a47f49c Merge branch 'acs-lats' into acs-backend 2023-10-25 21:45:51 -04:00
brian.long 020c4822fd Merge branch 'acs-search' into acs-backend 2023-10-25 21:45:36 -04:00
brian.long 105b34664a Merge branch 'acs-lats-base' into acs-lats 2023-10-25 21:43:40 -04:00
brian.long 59c87eb302 added solr health check 2023-10-25 20:37:32 -04:00
brian.long 8c875fe850 Merge branch 'acs-search-base' into acs-search 2023-10-25 20:30:58 -04:00
brian.long 415994f1f3 ATE AIO v4.0.0 2023-10-25 20:23:36 -04:00
brian.long 9a93ec369c Merge branch 'acs-base' into acs-lats-base 2023-10-25 20:23:20 -04:00
brian.long 81ca2ed038 ACS search 2.0.8.2 2023-10-25 20:21:21 -04:00
brian.long 51b777c0c5 Merge branch 'acs-base' into acs-search-base 2023-10-25 20:19:55 -04:00
brian.long f7c664e7f4 Merge branch 'acs-base' into acs-persist 2023-10-25 20:14:48 -04:00
brian.long ef221d9c7a Merge branch 'acs-base' into acs 2023-10-25 20:11:38 -04:00
brian.long a24bf1b647 Merge branch 'acs-search-persist' into acs-backend-persist 2022-11-01 16:46:48 -04:00
brian.long 6d56f610a7 Merge branch 'acs-backend' into acs-backend-persist 2022-11-01 16:46:14 -04:00
brian.long 4748d0e7b6 Merge branch 'acs-persist' into acs-search-persist 2022-11-01 16:44:50 -04:00
brian.long 299d2fe04d Merge branch 'acs-search-base' into acs-search-persist 2022-11-01 16:43:23 -04:00
brian.long c60e224a14 Merge branch 'acs-lats' into acs-backend 2022-11-01 16:17:27 -04:00
brian.long fc74faf57a Merge branch 'acs-search' into acs-backend 2022-11-01 16:16:59 -04:00
brian.long da933f2aa7 Merge branch 'acs' into acs-lats 2022-11-01 16:15:28 -04:00
brian.long 10aa561c52 Merge branch 'acs-lats-base' into acs-lats 2022-11-01 16:11:15 -04:00
brian.long 2dc64b23e4 parameterized LATS version 2022-11-01 16:09:56 -04:00
brian.long e9186dec84 Merge branch 'acs-base' into acs-lats-base 2022-11-01 16:08:01 -04:00
brian.long d556040909 Merge branch 'acs' into acs-search 2022-11-01 16:05:53 -04:00
brian.long 64f85da579 Merge branch 'acs-search-base' into acs-search 2022-11-01 16:04:44 -04:00
brian.long 8a7d6d2016 Merge branch 'acs-base' into acs-persist 2022-11-01 15:09:25 -04:00
brian.long 9899d03da9 parameterized ASIE version; enabled secret comms 2022-11-01 15:07:51 -04:00
brian.long 5b4069427e Merge branch 'acs-base' into acs-search-base 2022-11-01 15:04:21 -04:00
brian.long 7511eba729 added memory limit 2022-11-01 14:54:47 -04:00
brian.long 173de2375e Merge branch 'acs-base' into acs 2022-11-01 14:52:59 -04:00
brian.long 481e1bb38d Merge branch 'acs-base' into acs 2022-11-01 14:22:57 -04:00
brian.long e62b0838f2 Merge branch 'acs-backend' into acs-backend-persist 2021-07-30 16:12:48 -04:00
brian.long 3a2220d215 Merge branch 'acs-search' into acs-backend 2021-07-30 16:08:53 -04:00
brian.long f0713c90dd Merge branch 'acs-lats' into acs-backend 2021-07-30 16:08:47 -04:00
brian.long 0332838752 updated ATE AIO memory limit min 2021-07-30 15:57:23 -04:00
brian.long 35e15a1735 Merge branch 'acs' into acs-lats 2021-07-30 15:56:37 -04:00
brian.long 979924957c updated ASS memory limit min 2021-07-30 15:53:20 -04:00
brian.long 2a4b61053d Merge branch 'acs' into acs-search 2021-07-30 15:52:35 -04:00
brian.long b8016f4ac7 updated ACS memory limits 2021-07-30 15:52:07 -04:00
brian 38def362f6 Merge branch 'acs-search-persist' into acs-backend-persist 2021-04-02 09:14:37 -04:00
brian f3d3293e9e Merge branch 'acs-backend' into acs-backend-persist 2021-04-02 09:14:36 -04:00
brian 456950f31d Merge branch 'acs-lats' into acs-backend 2021-04-02 09:14:29 -04:00
brian 6740f23779 Merge branch 'acs-search' into acs-backend 2021-04-02 09:14:28 -04:00
brian 880221a953 Merge branch 'acs-lats-base' into acs-lats 2021-04-02 09:14:00 -04:00
brian 398d6692f8 Merge branch 'acs' into acs-lats 2021-04-02 09:13:59 -04:00
brian 2c82f844b1 Merge branch 'acs-search-base' into acs-search-persist 2021-04-02 09:13:47 -04:00
brian b805fbbd1a Merge branch 'acs-persist' into acs-search-persist 2021-04-02 09:13:46 -04:00
brian 99d39fa7f7 Merge branch 'acs-search-base' into acs-search 2021-04-02 09:13:42 -04:00
brian 1778fd04a4 Merge branch 'acs' into acs-search 2021-04-02 09:13:41 -04:00
brian d616b9ef3a Merge branch 'acs-base' into acs 2021-04-02 09:13:32 -04:00
brian a72d43a6af Merge branch 'acs-base' into acs-search-base 2021-04-02 09:13:30 -04:00
brian b7c883068a Merge branch 'acs-base' into acs-persist 2021-04-02 09:13:27 -04:00
brian 5a16e389c4 Merge branch 'acs-base' into acs-lats-base 2021-04-02 09:13:25 -04:00
brian.long 53404852e1 Merge branch 'acs-backend.acs-lats' into acs-backend-persist.acs-backend 2021-01-06 16:37:17 -05:00
brian.long 75743d2391 Merge branch 'acs-search-persist.acs-persist' into acs-backend-persist.acs-search-persist 2021-01-06 16:36:22 -05:00
brian.long 078b2ae35c Merge branch 'acs-lats.acs' into acs-backend.acs-lats 2021-01-06 16:27:31 -05:00
brian.long 5ff71f0e3c Merge branch 'acs-search.acs' into acs-backend.acs-search 2021-01-06 16:27:17 -05:00
brian.long 2878298644 Merge branch 'acs-search-base.acs-base' into acs-search.acs-search-base 2021-01-06 16:26:04 -05:00
brian.long 11bb8c62ed Merge branch 'acs.acs-base' into acs-search.acs 2021-01-06 16:24:47 -05:00
brian.long 30f3420ee5 Merge branch 'acs-lats-base.acs-base' into acs-lats.acs-lats-base 2021-01-06 16:24:29 -05:00
brian.long 677a3e1dc8 Merge branch 'acs.acs-base' into acs-lats.acs 2021-01-06 16:24:01 -05:00
brian.long 2ec11a1135 Merge branch 'acs-base.proxy' into acs-lats-base.acs-base 2021-01-06 16:12:46 -05:00
brian.long 6a8b1e2628 Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist 2021-01-06 16:11:47 -05:00
brian.long 932159b238 Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base 2021-01-06 16:11:28 -05:00
brian.long 962817ba63 Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2021-01-06 15:56:25 -05:00
brian.long 135739da10 Merge branch 'acs-base.proxy' into acs-persist.acs-base 2021-01-06 15:56:03 -05:00
brian.long d70efc6943 parameterized AOS 2021-01-06 15:19:41 -05:00
brian.long e660d79ef1 Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community 2021-01-06 12:23:49 -05:00
brian.long f036e13180 Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community 2021-01-06 12:23:35 -05:00
brian.long 83db2b08dc Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2021-01-06 12:23:18 -05:00
brian.long 40207d43ff Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community 2021-01-06 12:22:58 -05:00
brian.long a3cb815dd1 Merge branch 'acs-base.proxy' into acs-community.acs-base 2021-01-06 12:22:27 -05:00
brian.long 02a2ec72c0 Merge branch 'acs-backend-community.acs-lats-community' into acs-backend-community-persist.acs-backend-community 2020-12-26 14:23:53 -05:00
brian.long 41b87a9e5e Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community 2020-12-26 14:20:33 -05:00
brian.long 86ad2bc409 Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community 2020-12-26 14:20:12 -05:00
brian.long 2a56247aa1 Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base 2020-12-26 14:18:48 -05:00
brian.long efb9210c5a Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community 2020-12-26 14:18:31 -05:00
brian.long 48d46aa70c Merge branch 'acs-base.proxy' into acs-lats-base.acs-base 2020-12-26 14:18:13 -05:00
brian.long fc9c26eac5 Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-26 14:02:30 -05:00
brian.long 720346e9d7 Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist 2020-12-26 14:01:13 -05:00
brian.long 68e0652872 Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base 2020-12-26 14:00:56 -05:00
brian.long 2715b3afea Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2020-12-26 14:00:14 -05:00
brian.long b81db4fc0f Merge branch 'acs-base.proxy' into acs-persist.acs-base 2020-12-26 13:59:41 -05:00
brian.long 55b70f1a36 Merge branch 'acs-base.proxy' into acs-community.acs-base 2020-12-26 13:58:15 -05:00
brian.long 253b7fd3f2 Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base 2020-12-26 13:50:37 -05:00
brian.long c377995a1d Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist 2020-12-26 13:48:22 -05:00
brian.long e223fd99a3 Merge commit '9f75b4439d19154e3aaa48e19d05451530333613' into acs-search-persist.acs-search-base 2020-12-26 13:47:30 -05:00
brian.long 9f75b4439d Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2020-12-26 13:46:21 -05:00
brian.long 5beadf9f35 Merge branch 'acs-base.proxy' into acs-persist.acs-base 2020-12-26 13:45:22 -05:00
brian.long 3ac57ce7d1 Merge branch 'acs-base.proxy' into acs-community.acs-base 2020-12-26 13:37:05 -05:00
brian.long 24337f3a13 Merge branch 'acs-backend-community.acs-lats-community' into acs-backend-community-persist.acs-backend-community 2020-12-25 23:55:11 -05:00
brian.long 04988e43dd Merge branch 'acs-search-persist.acs-persist' into acs-backend-community-persist.acs-search-persist 2020-12-25 23:54:43 -05:00
brian.long f94f3e82e8 Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base 2020-12-25 23:52:04 -05:00
brian.long cb5d306478 Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist 2020-12-25 23:51:38 -05:00
brian.long abaa41345a Merge branch 'acs-base.proxy' into acs-persist.acs-base 2020-12-25 23:51:17 -05:00
brian.long 17f70ea253 Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community 2020-12-25 23:40:25 -05:00
brian.long 2173a9eb5b Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community 2020-12-25 23:40:01 -05:00
brian.long 8e1a7f11ca Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base 2020-12-25 23:39:36 -05:00
brian.long ca1eaa8bff Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community 2020-12-25 23:39:19 -05:00
brian.long 520e211c11 Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base 2020-12-25 23:38:58 -05:00
brian.long 1635445cba Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-25 23:38:36 -05:00
brian.long 6ec4a797ca Merge branch 'acs-base.proxy' into acs-community.acs-base 2020-12-25 23:38:22 -05:00
brian.long 32ad6d8195 Merge branch 'acs-base.proxy' into acs-lats-base.acs-base 2020-12-25 23:32:25 -05:00
brian.long 0ed77985f0 Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2020-12-25 23:32:10 -05:00
brian.long 0488b3402d Merge branch 'acs-backend-community.acs-lats-community' into acs-backend-community-persist.acs-backend-community 2020-12-21 11:56:57 -05:00
brian.long fad6fe1c2a Merge branch 'acs-persist.acs-base' into acs-search-persist.acs-persist 2020-12-17 21:33:18 -05:00
brian.long 2789af0bd7 added persistence to activemq 2020-12-17 21:31:57 -05:00
brian.long 91da0dedb6 Merge branch 'acs-search-base.acs-base' into acs-search-persist.acs-search-base 2020-12-17 21:30:09 -05:00
brian.long 8d3c4987f0 added persistence to platform/db 2020-12-17 21:26:03 -05:00
brian.long 701489665a Merge branch 'acs-lats-community.acs-lats-base' into acs-backend-community.acs-lats-community 2020-12-17 21:03:07 -05:00
brian.long 0976a3975f Merge branch 'acs-min-community.acs-base' into acs-lats-community.acs-min-community 2020-12-17 21:02:41 -05:00
brian.long 0ad2cdf9ad Merge branch 'acs-search-community.acs-min-community' into acs-backend-community.acs-search-community 2020-12-17 21:01:06 -05:00
brian.long 1d0aa0c91e fixed solr configuration on platform 2020-12-17 21:00:27 -05:00
brian.long 7a005d16d7 Merge branch 'acs-min-community.acs-base' into acs-search-community.acs-min-community 2020-12-17 20:50:09 -05:00
brian.long 60b5a8989b changed from v6.2.2-RC1 to v6.2.0-ga 2020-12-17 20:42:54 -05:00
brian.long 7bb62f421e Merge branch 'acs-search-community.acs-community' into acs-backend-community.acs-search-community 2020-12-17 18:55:51 -05:00
brian.long f02d4ff427 Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community 2020-12-17 18:55:28 -05:00
brian.long 1e09466e78 Merge branch 'acs-community.acs-base' into acs-lats-community.acs-community 2020-12-17 18:54:28 -05:00
brian.long b762ba0ce1 Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-17 18:53:59 -05:00
brian.long c22af67a06 disabled jodconverter in platform 2020-12-17 18:53:34 -05:00
brian.long 1216469feb Merge branch 'acs-lats-community.acs-community' into acs-search-lats-community.acs-lats-community 2020-12-17 16:48:32 -05:00
brian.long 6a6dbdc798 set core-aio version 2020-12-17 16:48:13 -05:00
brian.long 2ac3d013c9 Merge branch 'acs-search-community.acs-community' into acs-search-lats-community.acs-search-community 2020-12-17 16:43:44 -05:00
brian.long 80a938d674 Merge branch 'acs-lats-base.acs-base' into acs-lats-community.acs-lats-base 2020-12-17 16:42:16 -05:00
brian.long ddb535ab14 added legacy transform URLs 2020-12-17 16:40:02 -05:00
brian.long a7cacf8edc Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base 2020-12-17 16:35:44 -05:00
brian.long 43d5686407 Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-17 16:35:11 -05:00
brian.long e29e80b650 Merge branch 'acs-base.proxy' into acs-community.acs-base 2020-12-17 16:34:26 -05:00
brian.long 331eda62fc Merge branch 'acs-base.proxy' into acs-lats-base.acs-base 2020-12-17 16:33:23 -05:00
brian.long fbf7ca3678 Merge branch 'acs-base.proxy' into acs-search-base.acs-base 2020-12-17 16:32:50 -05:00
brian.long 69974eaeea Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-search-base 2020-12-17 13:24:15 -05:00
brian.long 82d6fd5c8a Merge branch 'acs-community.acs-base' into acs-search-community.acs-community 2020-12-17 13:22:28 -05:00
brian.long 90e935a49e minor fixes 2020-12-17 13:22:05 -05:00
brian.long 6e32209824 Merge branch 'acs-base.base' into acs-community.acs-base 2020-12-17 13:20:59 -05:00
brian.long 0bb3b7bb28 added service name reference to platform 2020-12-17 13:07:55 -05:00
brian.long f97b6b973b Merge branch 'acs-base.base' into acs-lats-base.acs-base 2020-12-17 13:04:06 -05:00
brian.long 63d1ee7ef9 changed service from solr6 to search; added service name variables 2020-12-17 13:03:32 -05:00
brian.long a081d5b5c8 Merge branch 'acs-base.base' into acs-search-base.acs-base 2020-12-17 12:56:03 -05:00
brian.long 8a5004ed74 Merge branch 'acs-search-base.acs-base' into acs-search-community.acs-community 2020-12-17 12:29:33 -05:00
brian.long 3fea801d26 added minimum local transform service 2020-12-17 00:01:13 -05:00
brian.long d0a62bfd24 Merge branch 'acs-base.base' into acs-community.acs-base 2020-12-16 23:57:29 -05:00
brian.long 7cedfa4fa2 Merge branch 'acs-base.base' into acs-search-base.acs-base 2020-12-16 23:56:43 -05:00
brian.long 723f3ec954 configured for ACS community v6.2.2-RC1 2020-12-16 23:55:00 -05:00
brian.long dcb88c42ea added minimum unconfigured search service 2020-12-16 23:44:46 -05:00
32 changed files with 70 additions and 315 deletions
+2 -1
View File
@@ -6,6 +6,7 @@ PROXY_HOST=localhost
PROXY_PORT=8080 PROXY_PORT=8080
ACS_TAG=7.4.1.1 ACS_TAG=7.4.1.1
ATE_AIO_TAG=4.0.0
AAMQ_TAG=latest AAMQ_TAG=latest
POSTGRES_TAG=13 POSTGRES_TAG=13
ACS_SHARE_TAG=7.4.1.2 ASIE_TAG=2.0.8.2
@@ -1,17 +0,0 @@
ARG ACS_TAG=inject-it
FROM alfresco/alfresco-content-repository-community:${ACS_TAG}
ARG USERNAME=alfresco
ARG TOMCAT_DIR=/usr/local/tomcat
USER root
COPY catalina.policy /tmp/catalina.policy.ext
COPY tomcat-platform-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/alfresco.xml
COPY *.amp ${TOMCAT_DIR}/amps/
RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps ${TOMCAT_DIR}/webapps/alfresco -nobackup -directory && \
mkdir -p ${TOMCAT_DIR}/modules/platform && \
cat /tmp/catalina.policy.ext >> ${TOMCAT_DIR}/conf/catalina.policy
USER ${USERNAME}
@@ -1,3 +0,0 @@
## Usage
Download all AMP files needed into this directory. All of them will be copied into a new Docker image and installed into the Alfresco Platform web application.
@@ -1,4 +0,0 @@
grant codeBase "file:${catalina.base}/modules/-" {
permission java.security.AllPermission;
};
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<Context>
<Resources>
<PreResources base="${catalina.base}/modules/platform" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" readOnly="true" />
</Resources>
</Context>
@@ -1,3 +0,0 @@
## Usage
Download all JAR module files needed into this directory. All of them will be dynamically loaded into the Docker container and loaded into the Alfresco Platform web application.
-11
View File
@@ -1,11 +0,0 @@
ARG ACS_SHARE_TAG=inject-it
FROM alfresco/alfresco-share:${ACS_SHARE_TAG}
ARG TOMCAT_DIR=/usr/local/tomcat
COPY tomcat-share-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/share.xml
COPY *.amp ${TOMCAT_DIR}/amps_share/
RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps_share ${TOMCAT_DIR}/webapps/share -nobackup -directory && \
mkdir -p ${TOMCAT_DIR}/modules/share
-3
View File
@@ -1,3 +0,0 @@
## Usage
Download all AMP files needed into this directory. All of them will be copied into a new Docker image and installed into the Alfresco Share web application.
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<Context>
<Resources>
<PreResources base="${catalina.base}/modules/share" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" readOnly="true" />
</Resources>
</Context>
-3
View File
@@ -1,3 +0,0 @@
## Usage
Download all JAR module files needed into this directory. All of them will be dynamically loaded into the Docker container and loaded into the Alfresco Share web application.
+68 -32
View File
@@ -5,11 +5,7 @@ version: "3"
services: services:
platform: platform:
build: image: alfresco/alfresco-content-repository-community:${ACS_TAG}
context: ./alfresco-content-repository/docker
args:
ACS_TAG: ${ACS_TAG}
image: local/alfresco-content-repository:latest
environment: environment:
JAVA_TOOL_OPTIONS: " JAVA_TOOL_OPTIONS: "
-Dencryption.keystore.type=JCEKS -Dencryption.keystore.type=JCEKS
@@ -19,56 +15,96 @@ services:
-Dmetadata-keystore.password=mp6yc0UD9e -Dmetadata-keystore.password=mp6yc0UD9e
-Dmetadata-keystore.aliases=metadata -Dmetadata-keystore.aliases=metadata
-Dmetadata-keystore.metadata.password=oKIWzVdEdA -Dmetadata-keystore.metadata.password=oKIWzVdEdA
-Dmetadata-keystore.metadata.algorithm=DESede" -Dmetadata-keystore.metadata.algorithm=DESede
"
JAVA_OPTS: " JAVA_OPTS: "
-Xms512m -Xmx1g
-Ddb.driver=org.postgresql.Driver -Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
-Ddb.password=alfresco
-Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-Dshare.host=${PROXY_HOST} -Dindex.subsystem.name=solr6
-Dshare.port=${PROXY_PORT} -Dsolr.host=search
-Dshare.protocol=${PROXY_PROTOCOL} -Dsolr.secureComms=secret
-Dsolr.sharedSecret=alfresco-secret
-Dalfresco.host=${PROXY_HOST} -Dalfresco.host=${PROXY_HOST}
-Dalfresco.port=${PROXY_PORT} -Dalfresco.port=${PROXY_PORT}
-Dalfresco.protocol=${PROXY_PROTOCOL} -Dalfresco.protocol=${PROXY_PROTOCOL}
-Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE
-DlocalTransform.core-aio.url=http://transform-core-aio:8090/
-Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/
-Djodconverter.url=http://transform-core-aio:8090/
-Dimg.url=http://transform-core-aio:8090/
-Dtika.url=http://transform-core-aio:8090/
-Dtransform.misc.url=http://transform-core-aio:8090/
-Dcsrf.filter.enabled=false
-Dcors.enabled=true
-Dcors.allowed.origins=http://localhost:4200,http://localhost:8080,${PROXY_PROTOCOL}://${PROXY_HOST}
-Dtransform.service.enabled=false
-Dlocal.transform.service.enabled=true
-Dsystem.content.eagerOrphanCleanup=true
-Dsystem.content.orphanProtectDays=0
-Djodconverter.enabled=false
" "
depends_on: depends_on:
- postgres-acs - postgres-acs
- activemq - activemq
volumes: volumes:
- "./alfresco-content-repository/modules:/usr/local/tomcat/modules/platform:ro" - acsbin-volume:/usr/local/tomcat/alf_data:rw
share: transform-core-aio:
build: image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
context: ./alfresco-share/docker
args:
ACS_SHARE_TAG: ${ACS_SHARE_TAG}
image: local/alfresco-share:latest
environment:
REPO_HOST: "platform"
CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*"
CSRF_FILTER_ORIGIN: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?"
JAVA_OPTS: "
-Dshare.host=${PROXY_HOST}
-Dshare.port=${PROXY_PORT}
-Dshare.protocol=${PROXY_PROTOCOL}
-Dalfresco.host=${PROXY_HOST}
-Dalfresco.port=${PROXY_PORT}
-Dalfresco.protocol=${PROXY_PROTOCOL}
"
volumes:
- "./alfresco-share/modules:/usr/local/tomcat/modules/share:ro"
postgres-acs: postgres-acs:
image: postgres:${POSTGRES_TAG} image: postgres:${POSTGRES_TAG}
environment:
POSTGRES_PASSWORD: alfresco
POSTGRES_USER: alfresco
POSTGRES_DB: alfresco
command: postgres -c max_connections=300 -c log_min_messages=LOG
volumes:
- acsdb-volume:/var/lib/postgresql/data:rw
search:
image: alfresco/alfresco-search-services:${ASIE_TAG}
environment:
SOLR_ALFRESCO_HOST: platform
SOLR_SOLR_HOST: search
SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
ALFRESCO_SECURE_COMMS: secret
JAVA_TOOL_OPTIONS: "
-Dalfresco.secureComms.secret=alfresco-secret
"
healthcheck:
test: "curl -fsS http://localhost:8983/solr"
volumes:
- solrindex-volume:/opt/alfresco-search-services/data:rw
activemq: activemq:
image: alfresco/alfresco-activemq:${AAMQ_TAG} image: alfresco/alfresco-activemq:${AAMQ_TAG}
environment:
ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
ACTIVEMQ_ADMIN_LOGIN: alfresco
ACTIVEMQ_ADMIN_PASSWORD: alfresco
volumes:
- activemq-volume:/opt/activemq/data:rw
proxy: proxy:
build: ./nginx-ingress build: ./nginx-ingress
image: local/nginx-ingress:acs-share image: local/nginx-ingress:acs
ports: ports:
- 8080:8080 - 8080:8080
depends_on: depends_on:
- platform - platform
- share
volumes:
acsbin-volume:
driver: local
acsdb-volume:
driver: local
activemq-volume:
driver: local
solrindex-volume:
driver: local
-16
View File
@@ -1,16 +0,0 @@
# Usage: .\download-jsconsole.ps1
$THISDIR=$PSScriptRoot
$GITHUB_TAG="v0.6.0-rc1"
$MAVEN_VERSION="0.6.0"
$BASEURL="https://github.com/share-extras/js-console/releases/download"
$FILENAME="javascript-console-repo-${MAVEN_VERSION}.amp"
$URL="${BASEURL}/${GITHUB_TAG}/${FILENAME}"
$PATH="${THISDIR}/alfresco-content-repository/docker/${FILENAME}"
Invoke-Expression "& '${THISDIR}\scripts\download-url.ps1' '${URL}' '${PATH}'"
$FILENAME="javascript-console-share-${MAVEN_VERSION}.amp"
$URL="${BASEURL}/${GITHUB_TAG}/${FILENAME}"
$PATH="${THISDIR}/alfresco-share/docker/${FILENAME}"
Invoke-Expression "& '${THISDIR}\scripts\download-url.ps1' '${URL}' '${PATH}'"
-17
View File
@@ -1,17 +0,0 @@
#!/bin/sh
# Usage: ./download-jsconsole.sh
THISDIR=`dirname "$(readlink -f "$0")"`
GITHUB_TAG=v0.6.0-rc1
MAVEN_VERSION=0.6.0
BASEURL=https://github.com/share-extras/js-console/releases/download
FILENAME=javascript-console-repo-${MAVEN_VERSION}.amp
URL=${BASEURL}/${GITHUB_TAG}/${FILENAME}
PATH=${THISDIR}/alfresco-content-repository/docker/${FILENAME}
${THISDIR}/scripts/download-url.sh "${URL}" "${PATH}"
FILENAME=javascript-console-share-${MAVEN_VERSION}.amp
URL=${BASEURL}/${GITHUB_TAG}/${FILENAME}
PATH=${THISDIR}/alfresco-share/docker/${FILENAME}
${THISDIR}/scripts/download-url.sh "${URL}" "${PATH}"
-4
View File
@@ -4,10 +4,6 @@ if [[ $ACS_PLATFORM_URL ]]; then
sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
fi fi
if [[ $ACS_SHARE_URL ]]; then
sed -i s%http:\/\/share:8080%"$ACS_SHARE_URL"%g /etc/nginx/nginx.conf
fi
if [[ $ACCESS_LOG ]]; then if [[ $ACCESS_LOG ]]; then
sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
fi fi
-7
View File
@@ -48,12 +48,5 @@ http {
# If using external proxy / load balancer (for initial redirect if no trailing slash) # If using external proxy / load balancer (for initial redirect if no trailing slash)
absolute_redirect off; absolute_redirect off;
} }
location /share/ {
proxy_pass http://share:8080;
# If using external proxy / load balancer (for initial redirect if no trailing slash)
absolute_redirect off;
}
} }
} }
@@ -1,8 +0,0 @@
REM Usage: .\download-maven-alfresco-private.bat org/maven/group/path maven-artifact-id 1.2.3 jar a_username a_password
@echo off
set THISDIR_REL=%~dp0
set THISDIR=%THISDIR_REL:~0,-1%
set MAVEN_BASEURL=https://artifacts.alfresco.com/nexus/content/groups/private
call "%THISDIR%\download-maven.bat" %MAVEN_BASEURL% %*
@@ -1,6 +0,0 @@
# Usage: .\download-maven-alfresco-private.ps1 org/maven/group/path maven-artifact-id 1.2.3 jar a_username a_password
$THISDIR=$PSScriptRoot
$MAVEN_BASEURL="https://artifacts.alfresco.com/nexus/content/groups/private"
Invoke-Expression "& '${THISDIR}\download-maven.ps1' '${MAVEN_BASEURL}' $args"
@@ -1,7 +0,0 @@
#!/bin/sh
# Usage: ./download-maven-alfresco-private.sh org/maven/group/path maven-artifact-id 1.2.3 jar a_username a_password
THISDIR=`dirname "$(readlink -f "$0")"`
MAVEN_BASEDIR="https://artifacts.alfresco.com/nexus/content/groups/private"
${THISDIR}/download-maven.sh "${MAVEN_BASEDIR}" $*
@@ -1,8 +0,0 @@
REM Usage: .\download-maven-alfresco-public.bat org/maven/group/path maven-artifact-id 1.2.3 jar
@echo off
set THISDIR_REL=%~dp0
set THISDIR=%THISDIR_REL:~0,-1%
set MAVEN_BASEURL=https://artifacts.alfresco.com/nexus/content/groups/public
call "%THISDIR%\download-maven.bat" %MAVEN_BASEURL% %*
@@ -1,6 +0,0 @@
# Usage: .\download-maven-alfresco-public.ps1 org/maven/group/path maven-artifact-id 1.2.3 jar
$THISDIR=$PSScriptRoot
$MAVEN_BASEURL="https://artifacts.alfresco.com/nexus/content/groups/public"
Invoke-Expression "& '${THISDIR}\download-maven.ps1' '${MAVEN_BASEURL}' $args"
@@ -1,7 +0,0 @@
#!/bin/sh
# Usage: ./download-maven-alfresco-public.sh org/maven/group/path maven-artifact-id 1.2.3 jar
THISDIR=`dirname "$(readlink -f "$0")"`
MAVEN_BASEDIR="https://artifacts.alfresco.com/nexus/content/groups/public"
${THISDIR}/download-maven.sh "${MAVEN_BASEDIR}" $*
@@ -1,7 +0,0 @@
#!/bin/sh
# Usage: ./download-maven-inteligr8-private.sh org/maven/group/path maven-artifact-id 1.2.3 jar a_username a_password
THISDIR=`dirname "$(readlink -f "$0")"`
MAVEN_BASEURL="http://repos.yateslong.us/nexus/repository/inteligr8"
${THISDIR}/download-maven.sh "${MAVEN_BASEURL}" $*
@@ -1,7 +0,0 @@
#!/bin/sh
# Usage: ./download-maven-inteligr8-public.sh org/maven/group/path maven-artifact-id 1.2.3 jar
THISDIR=`dirname "$(readlink -f "$0")"`
MAVEN_BASEURL="http://repos.yateslong.us/nexus/repositories/inteligr8-public"
${THISDIR}/download-maven.sh "${MAVEN_BASEURL}" $*
-18
View File
@@ -1,18 +0,0 @@
REM Usage: .\download-maven.bat https://repo1.maven.org/maven2 org/maven/group/path maven-artifact-id 1.2.3 jar
REM Usage: .\download-maven.bat https://repo1.maven.org/maven2 org/maven/group/path maven-artifact-id 1.2.3 jar a_username a_password
@echo off
set THISDIR_REL=%~dp0
set THISDIR=%THISDIR_REL:~0,-1%
set MAVEN_BASEURL=%1
set MAVEN_GROUP_PATH=%2
set MAVEN_ARTIFACT_ID=%3
set MAVEN_ARTIFACT_VERSION=%4
set MAVEN_PACKAGING=%5
set HTTP_USERNAME=%6
set HTTP_PASSWORD=%7
set MAVEN_ARTIFACT_FILENAME=%MAVEN_ARTIFACT_ID%-%MAVEN_ARTIFACT_VERSION%.%MAVEN_PACKAGING%
set MAVEN_URL=%MAVEN_BASEURL%/%MAVEN_GROUP_PATH%/%MAVEN_ARTIFACT_ID%/%MAVEN_ARTIFACT_VERSION%/%MAVEN_ARTIFACT_FILENAME%
call "%THISDIR%\download-url.bat" %MAVEN_URL% %MAVEN_ARTIFACT_FILENAME% %HTTP_USERNAME% %HTTP_PASSWORD%
-16
View File
@@ -1,16 +0,0 @@
# Usage: .\download-maven.ps1 https://repo1.maven.org/maven2 org/maven/group/path maven-artifact-id 1.2.3 jar
# Usage: .\download-maven.ps1 https://repo1.maven.org/maven2 org/maven/group/path maven-artifact-id 1.2.3 jar a_username a_password
$THISDIR=$PSScriptRoot
$MAVEN_BASEURL=$args[0]
$MAVEN_GROUP_PATH=$args[1]
$MAVEN_ARTIFACT_ID=$args[2]
$MAVEN_ARTIFACT_VERSION=$args[3]
$MAVEN_PACKAGING=$args[4]
$HTTP_USERNAME=$args[5]
$HTTP_PASSWORD=$args[6]
$MAVEN_ARTIFACT_FILENAME="${MAVEN_ARTIFACT_ID}-${MAVEN_ARTIFACT_VERSION}.${MAVEN_PACKAGING}"
$MAVEN_URL="${MAVEN_BASEURL}/${MAVEN_GROUP_PATH}/${MAVEN_ARTIFACT_ID}/${MAVEN_ARTIFACT_VERSION}/${MAVEN_ARTIFACT_FILENAME}"
Invoke-Expression "& '${THISDIR}\download-url.ps1' '${MAVEN_URL}' '${MAVEN_ARTIFACT_FILENAME}' '${HTTP_USERNAME}' '${HTTP_PASSWORD}'"
-18
View File
@@ -1,18 +0,0 @@
#!/bin/sh
# Usage: ./download-maven.sh https://repo1.maven.org/maven2 org/maven/group/path maven-artifact-id 1.2.3 jar
# Usage: ./download-maven.sh https://repo1.maven.org/maven2 org/maven/group/path maven-artifact-id 1.2.3 jar a_username a_password
THISDIR=`dirname "$(readlink -f "$0")"`
MAVEN_BASEURL=$1
MAVEN_GROUP_PATH=$2
MAVEN_ARTIFACT_ID=$3
MAVEN_ARTIFACT_VERSION=$4
MAVEN_PACKAGING=$5
HTTP_USERNAME=$6
HTTP_PASSWORD=$7
MAVEN_ARTIFACT_FILENAME=${MAVEN_ARTIFACT_ID}-${MAVEN_ARTIFACT_VERSION}.${MAVEN_PACKAGING}
MAVEN_URL=${MAVEN_BASEURL}/${MAVEN_GROUP_PATH}/${MAVEN_ARTIFACT_ID}/${MAVEN_ARTIFACT_VERSION}/${MAVEN_ARTIFACT_FILENAME}
echo $MAVEN_URL
${THISDIR}/download-url.sh "${MAVEN_URL}" "${MAVEN_ARTIFACT_FILENAME}" "${HTTP_USERNAME}" "${HTTP_PASSWORD}"
-13
View File
@@ -1,13 +0,0 @@
REM Usage: .\download.bat https://www.a.url/to/download filename_for_downloaded.file
REM Usage: .\download.bat https://www.a.url/to/download filename_for_downloaded.file a_username a_password
@echo off
set URL=%1
set FILENAME=%2
if NOT "%~3" == "" (
set USERNAME=%3
set PASSWORD=%4
curl -L -o %FILENAME% -u %USERNAME%:%PASSWORD% %URL%
) else (
curl -L -o %FILENAME% %URL%
)
-16
View File
@@ -1,16 +0,0 @@
# Usage: .\download.ps1 https://www.a.url/to/download filename_for_downloaded.file
# Usage: .\download.ps1 https://www.a.url/to/download filename_for_downloaded.file a_username a_password
$URL=$args[0]
$FILENAME=$args[1]
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
if ($args.count -gt 2) {
$USERNAME=$args[2]
$PASSWORD=$args[3]
$AUTH_PAIR=[System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes("$($USERNAME):$($PASSWORD)"))
$AUTH_HEADERS=@{Authorization="Basic $AUTH_PAIR"}
Invoke-WebRequest -Uri "${URL}" -OutFile "${FILENAME}" -Headers ${AUTH_HEADERS}
} else {
Invoke-WebRequest -Uri "${URL}" -OutFile "${FILENAME}"
}
-13
View File
@@ -1,13 +0,0 @@
#!/bin/sh
# Usage: ./download.sh https://www.a.url/to/download filename_for_downloaded.file
# Usage: ./download.sh https://www.a.url/to/download filename_for_downloaded.file a_username a_password
URL=$1
FILENAME=$2
if [ "$#" -gt 2 ]; then
USERNAME=$3
PASSWORD=$4
curl -L -o "${FILENAME}" -u "${USERNAME}:${PASSWORD}" ${URL}
else
curl -L -o "${FILENAME}" ${URL}
fi
-11
View File
@@ -1,11 +0,0 @@
REM Usage: .\unpack.bat filename.zip
REM Usage: .\unpack.bat filename.zip c:\
@echo off
set FILENAME=%1
if NOT "%~2" == "" (
set DESTPATH=%2
powershell -command "Expand-Archive -Force -Path '%FILENAME%' -DestinationPath '%DESTPATH%'"
) else (
powershell -command "Expand-Archive -Force -Path '%FILENAME%' -DestinationPath '%~dp0'"
)
-10
View File
@@ -1,10 +0,0 @@
# Usage: .\unpack.ps1 filename.zip
# Usage: .\unpack.ps1 filename.zip c:\
$FILENAME=$args[0]
if ($args.count -gt 1) {
$DESTPATH=$args[1]
Expand-Archive -Force -Path "${FILENAME}" -DestinationPath "${DESTPATH}"
} else {
Expand-Archive -Force -Path "${FILENAME}"
}
-11
View File
@@ -1,11 +0,0 @@
#!/bin/sh
# Usage: ./unpack.sh filename.zip
# Usage: ./unpack.sh filename.zip /home/user
FILENAME=$1
if [ "$#" -gt 1 ]; then
DESTPATH=$2
unzip -d ${DESTPATH} ${FILENAME}
else
unzip ${FILENAME}
fi