Compare commits

...

74 Commits

Author SHA1 Message Date
b86dd34b55 Merge branch 'acs-share-base' into acs-ext-share 2023-10-25 22:16:36 -04:00
23b3057329 ACS share v7.4.1.2 2023-10-25 20:19:43 -04:00
b009fa9219 Merge branch 'acs-base' into acs-share-base 2023-10-25 20:17:55 -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
936e6ad134 Merge branch 'acs-share-base' into acs-ext-share 2022-11-01 21:28:59 -04:00
fcd1262721 parameterized ACS share version 2022-11-01 15:03:04 -04:00
d7de714eeb Merge branch 'acs-base' into acs-share-base 2022-11-01 15:01:38 -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
29f254a68e updated to ACS v7.3.0 2022-11-01 14:19:58 -04:00
4ff7371d19 separating share/platform module directories 2021-04-23 08:35:21 -04:00
brian
a41c084c9f Merge branch 'acs-share-base' into acs-ext-share 2021-04-02 09:14:21 -04:00
brian
bf09b85448 Merge branch 'acs-base' into acs-share-base 2021-04-02 09:13:10 -04:00
6bce626075 Merge branch 'proxy' into acs-base 2021-04-02 08:42:43 -04:00
3d6aa1d4bc Merge branch 'base' into proxy 2021-04-02 08:41:45 -04:00
f49ea55a48 Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base 2021-01-06 16:09:26 -05:00
3ef69c527b Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2021-01-06 15:54:53 -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
e582744e6c Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base 2021-01-06 10:45:43 -05:00
4afdf95b44 added share context to share config 2021-01-06 10:45:23 -05:00
31eaf8c7c2 Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base 2020-12-26 15:11:03 -05:00
89ffe20aee added CSRF 2020-12-26 15:10:13 -05:00
14a4c09f4d Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base 2020-12-26 14:27:06 -05:00
f2ac689f85 Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2020-12-26 13:56:13 -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
2367651a7e added share context removed from acs-base 2020-12-26 13:52:17 -05:00
b8b267d4c5 Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2020-12-26 13:51:34 -05:00
c0c6dcd1ce remove share context; moving to acs-share-base 2020-12-26 13:51:23 -05:00
68fcb3cbef added proxy config to share 2020-12-26 11:20:42 -05:00
4381a2d350 Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2020-12-26 11:19:21 -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
6d396a640f added JDBC driver to base config 2020-12-26 11:06:07 -05:00
486ff23ce4 Merge remote-tracking branch 'home/acs-ext-share.acs-share-base' into acs-ext-share.acs-share-base 2020-12-26 00:01:32 -05:00
bdef8c6b7f Merge branch 'acs-share-base.acs-base' into acs-ext-share.acs-share-base 2020-12-25 23:38:02 -05:00
4b9900a7fd Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2020-12-25 23:30:52 -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
b9f0597020 refactored JAR ext loading 2020-12-25 14:44:51 -05:00
18839c8019 enabled JAR extension loading 2020-12-25 14:39:01 -05:00
8a29bded24 fixed COPY for multiple files 2020-12-21 14:29:05 -05:00
cb04027103 fixed yaml format issue 2020-12-17 20:23:44 -05:00
893f9cf7a8 initial share extension framework 2020-12-17 19:39:36 -05:00
ff5442c869 added share to nginx 2020-12-17 16:32:32 -05:00
4cb5100065 Merge branch 'acs-base.proxy' into acs-share-base.acs-base 2020-12-17 16:31:16 -05:00
46bbeeef30 fixed missed envvar 2020-12-17 16:29:36 -05:00
6b0c103d75 added depends_on for proxy 2020-12-17 16:24:34 -05:00
faee3aaa48 Merge branch 'acs-proxy.proxy' into acs-base.acs-proxy 2020-12-17 16:20:23 -05:00
beb87dd97a Merge branch 'proxy.base' into acs-proxy.proxy 2020-12-17 16:20:12 -05:00
a42af25649 added port for localhost 2020-12-17 16:19:34 -05:00
db6a1e148c Merge branch 'acs-proxy.proxy' into acs-base.acs-proxy 2020-12-17 16:16:57 -05:00
ab396f7656 changed version to 'acs' 2020-12-17 16:16:44 -05:00
b65d3d301f Merge branch 'acs-proxy.proxy' into acs-base.acs-proxy 2020-12-17 16:16:07 -05:00
6332985ebd removed proxy 2020-12-17 16:09:48 -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
c084972d39 Merge branch 'acs-base.base' into acs-share-base.acs-base 2020-12-17 12:55:48 -05:00
79a1644530 more corrections to service names and addressing additions 2020-12-17 12:46:24 -05:00
5cfee3d18f updated service names 2020-12-17 12:31:55 -05:00
72f7960369 Merge branch 'acs-base.base' into acs-share-base.acs-base 2020-12-16 23:56:30 -05:00
6c665fab04 added depends_on for the alfresco service 2020-12-16 23:55:56 -05:00
00e0a17249 added share to proxy 2020-12-16 23:42:47 -05:00
bfa65c999e added share unconfigured service 2020-12-16 23:40:20 -05:00
0f36dd1943 added minimum unconfigured ACS services to Docker Compose 2020-12-16 23:34:34 -05:00
9 changed files with 181 additions and 0 deletions

11
.env
View File

@ -0,0 +1,11 @@
ALFRESCO_DIR=~/alfresco
ALFRESCO_LICENSE_DIR=~/alfresco/license
PROXY_PROTOCOL=http
PROXY_HOST=localhost
PROXY_PORT=8080
ACS_TAG=7.4.1.1
AAMQ_TAG=latest
POSTGRES_TAG=13
ACS_SHARE_TAG=7.4.1.2

View File

@ -0,0 +1,11 @@
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

View File

@ -0,0 +1,3 @@
## 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.

View File

@ -0,0 +1,6 @@
<?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>

View File

@ -0,0 +1,3 @@
## 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.

View File

@ -1,3 +1,68 @@
# Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
#
version: "3"
services:
platform:
image: alfresco/alfresco-content-repository-community:${ACS_TAG}
environment:
JAVA_TOOL_OPTIONS: "
-Dencryption.keystore.type=JCEKS
-Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-Dencryption.keyAlgorithm=DESede
-Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore
-Dmetadata-keystore.password=mp6yc0UD9e
-Dmetadata-keystore.aliases=metadata
-Dmetadata-keystore.metadata.password=oKIWzVdEdA
-Dmetadata-keystore.metadata.algorithm=DESede"
JAVA_OPTS: "
-Ddb.driver=org.postgresql.Driver
-Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-Dshare.host=${PROXY_HOST}
-Dshare.port=${PROXY_PORT}
-Dshare.protocol=${PROXY_PROTOCOL}
-Dalfresco.host=${PROXY_HOST}
-Dalfresco.port=${PROXY_PORT}
-Dalfresco.protocol=${PROXY_PROTOCOL}
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
"
depends_on:
- postgres-acs
- activemq
share:
build:
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:
image: postgres:${POSTGRES_TAG}
activemq:
image: alfresco/alfresco-activemq:${AAMQ_TAG}
proxy:
build: ./nginx-ingress
image: local/nginx-ingress:acs-share
ports:
- 8080:8080
depends_on:
- platform
- share

8
nginx-ingress/Dockerfile Normal file
View File

@ -0,0 +1,8 @@
FROM nginx:stable-alpine
COPY nginx.conf /etc/nginx/nginx.conf
COPY entrypoint.sh /
RUN chmod +x /entrypoint.sh
ENTRYPOINT [ "/entrypoint.sh" ]

View File

@ -0,0 +1,15 @@
#!/bin/sh
if [[ $ACS_PLATFORM_URL ]]; then
sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
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
sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
fi
nginx -g "daemon off;"

59
nginx-ingress/nginx.conf Normal file
View File

@ -0,0 +1,59 @@
worker_processes 1;
events {
worker_connections 1024;
}
http {
server {
listen *:8080;
client_max_body_size 0;
set $allowOriginSite *;
proxy_pass_request_headers on;
proxy_pass_header Set-Cookie;
# External settings, do not remove
#ENV_ACCESS_LOG
proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
proxy_redirect off;
proxy_buffering off;
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass_header Set-Cookie;
# Protect access to SOLR APIs
location ~ ^(/.*/service/api/solr/.*)$ {return 403;}
location ~ ^(/.*/s/api/solr/.*)$ {return 403;}
location ~ ^(/.*/wcservice/api/solr/.*)$ {return 403;}
location ~ ^(/.*/wcs/api/solr/.*)$ {return 403;}
location ~ ^(/.*/proxy/alfresco/api/solr/.*)$ {return 403 ;}
location ~ ^(/.*/-default-/proxy/alfresco/api/.*)$ {return 403;}
# Protect access to Prometheus endpoint
location ~ ^(/.*/s/prometheus)$ {return 403;}
location / {
proxy_pass http://platform:8080;
}
location /alfresco/ {
proxy_pass http://platform:8080;
# If using external proxy / load balancer (for initial redirect if no trailing slash)
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;
}
}
}