Merge branch 'acs-ext-share.acs-share-base' into ext-jsconsole.download

This commit is contained in:
Brian Long 2020-12-17 21:11:14 -05:00
commit f54efe3082
6 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,7 @@
FROM alfresco/alfresco-share:latest
ARG TOMCAT_DIR=/usr/local/tomcat
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

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,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

@ -18,6 +18,14 @@ services:
volumes: volumes:
- "./alfresco-content-repository/modules:/usr/local/tomcat/modules/platform:ro" - "./alfresco-content-repository/modules:/usr/local/tomcat/modules/platform:ro"
share:
build: ./alfresco-share/docker
image: local/alfresco-share:latest
environment:
REPO_HOST: "platform"
volumes:
- "./alfresco-share/modules:/usr/local/tomcat/modules/share:ro"
postgres-acs: postgres-acs:
image: postgres:latest image: postgres:latest
@ -26,8 +34,9 @@ services:
proxy: proxy:
build: ./nginx-ingress build: ./nginx-ingress
image: local/nginx-ingress:acs image: local/nginx-ingress:acs-share
ports: ports:
- 8080:8080 - 8080:8080
depends_on: depends_on:
- platform - platform
- share

View File

@ -4,6 +4,10 @@ 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

View File

@ -47,5 +47,12 @@ 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;
}
} }
} }