From bfa65c999ec00e6b4c65427b3237996e859cd250 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 16 Dec 2020 23:40:20 -0500 Subject: [PATCH 1/5] added share unconfigured service --- docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index dc160fe..2082de0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,9 @@ services: alfresco: image: alfresco/alfresco-content-repository:latest + share: + image: alfresco/alfresco-share:latest + postgres-acs: image: postgres:latest From 00e0a17249b887b015b446a1ab66dc7d652d58d3 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 16 Dec 2020 23:42:47 -0500 Subject: [PATCH 2/5] added share to proxy --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 2082de0..b4cea6d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,5 +20,6 @@ services: image: alfresco/alfresco-acs-nginx:latest depends_on: - alfresco + - share ports: - 8080:8080 From ff5442c869091362ea96f8bd99fe54702e901d98 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 16:32:32 -0500 Subject: [PATCH 3/5] added share to nginx --- docker-compose.yml | 2 +- nginx-ingress/entrypoint.sh | 4 ++++ nginx-ingress/nginx.conf | 7 +++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9eb0a72..f9499b3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: proxy: build: ./nginx-ingress - image: local/nginx-ingress:acs + image: local/nginx-ingress:acs-share ports: - 8080:8080 depends_on: diff --git a/nginx-ingress/entrypoint.sh b/nginx-ingress/entrypoint.sh index 3dc2e8e..48f44e8 100644 --- a/nginx-ingress/entrypoint.sh +++ b/nginx-ingress/entrypoint.sh @@ -4,6 +4,10 @@ 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 diff --git a/nginx-ingress/nginx.conf b/nginx-ingress/nginx.conf index 0bbab22..005cadc 100644 --- a/nginx-ingress/nginx.conf +++ b/nginx-ingress/nginx.conf @@ -47,5 +47,12 @@ http { # 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; + } } } From 893f9cf7a8742ea96482b234eaa3d4afb5f6bde6 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 19:39:36 -0500 Subject: [PATCH 4/5] initial share extension framework --- alfresco-share/docker/Dockerfile | 7 +++++++ alfresco-share/docker/README.md | 3 +++ alfresco-share/modules/README.md | 3 +++ docker-compose.yml | 5 ++++- 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 alfresco-share/docker/Dockerfile create mode 100644 alfresco-share/docker/README.md create mode 100644 alfresco-share/modules/README.md diff --git a/alfresco-share/docker/Dockerfile b/alfresco-share/docker/Dockerfile new file mode 100644 index 0000000..177661b --- /dev/null +++ b/alfresco-share/docker/Dockerfile @@ -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 diff --git a/alfresco-share/docker/README.md b/alfresco-share/docker/README.md new file mode 100644 index 0000000..ac21091 --- /dev/null +++ b/alfresco-share/docker/README.md @@ -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. diff --git a/alfresco-share/modules/README.md b/alfresco-share/modules/README.md new file mode 100644 index 0000000..8239f24 --- /dev/null +++ b/alfresco-share/modules/README.md @@ -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. diff --git a/docker-compose.yml b/docker-compose.yml index f9499b3..884ded0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,9 +16,12 @@ services: - activemq share: - image: alfresco/alfresco-share:latest + 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: image: postgres:latest From cb04027103b175466a5b1c8335a68f33e6c10bf8 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 20:23:44 -0500 Subject: [PATCH 5/5] fixed yaml format issue --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 884ded0..859f201 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,8 +20,8 @@ services: image: local/alfresco-share:latest environment: REPO_HOST: "platform" - volumes: - - "./alfresco-share/modules:/usr/local/tomcat/modules/share:ro" + volumes: + - "./alfresco-share/modules:/usr/local/tomcat/modules/share:ro" postgres-acs: image: postgres:latest