Merge branch 'base' into download

.env

@@ -1,6 +0,0 @@
-ALFRESCO_DIR=~/alfresco
-ALFRESCO_LICENSE_DIR=~/alfresco/license
-
-PROXY_PROTOCOL=http
-PROXY_HOST=localhost
-PROXY_PORT=8080

alfresco-content-repository/docker/Dockerfile

@@ -1,16 +0,0 @@
-FROM alfresco/alfresco-content-repository-community:6.2.0-ga
-
-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 && \
-	cat /tmp/catalina.policy.ext >> ${TOMCAT_DIR}/conf/catalina.policy
-
-USER ${USERNAME}

alfresco-content-repository/docker/README.md

@@ -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.

alfresco-content-repository/docker/catalina.policy

@@ -1,4 +0,0 @@
-grant codeBase "file:${catalina.base}/modules/-" {
-    permission java.security.AllPermission;
-};
-

alfresco-content-repository/docker/tomcat-platform-context.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Context>
-        <Resources>
-                <PreResources base="${catalina.base}/modules" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" readOnly="true" />
-        </Resources>
-</Context>
-

alfresco-content-repository/modules/README.md

@@ -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.

alfresco-share/docker/Dockerfile

@@ -1,10 +0,0 @@
-FROM alfresco/alfresco-share:6.2.2
-
-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
-

alfresco-share/docker/README.md

@@ -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.

alfresco-share/docker/tomcat-share-context.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Context>
-        <Resources>
-                <PreResources base="${catalina.base}/modules" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" readOnly="true" />
-        </Resources>
-</Context>
-

alfresco-share/modules/README.md

@@ -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.

docker-compose.yml

@@ -1,104 +1,3 @@
-# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
+# Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
 #
-# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
+version: "3"
-version: "2"
-
-services:
-    platform:
-        build: ./alfresco-content-repository/docker
-        image: local/alfresco-content-repository:6.2.0-ga
-        mem_limit: 1700m
-        environment:
-            JAVA_OPTS: "
-                -Ddb.driver=org.postgresql.Driver
-                -Ddb.username=alfresco
-                -Ddb.password=alfresco
-                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -Dindex.subsystem.name=solr6
-                -Dsolr.host=search
-                -Dsolr.port=8983
-                -Dsolr.secureComms=none
-                -Dshare.host=${PROXY_HOST}
-                -Dshare.port=${PROXY_PORT}
-                -Dshare.protocol=${PROXY_PROTOCOL}
-                -Dalfresco.host=${PROXY_HOST}
-                -Dalfresco.port=${PROXY_PORT}
-                -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\"
-                -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
-                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
-
-                -Dtransform.service.enabled=false
-                
-                -Dsystem.content.eagerOrphanCleanup=true
-                -Dsystem.content.orphanProtectDays=0
-                -Djodconverter.enabled=false
-                "
-        depends_on:
-            - postgres-acs
-            - activemq
-        volumes:
-            - "./alfresco-content-repository/modules:/usr/local/tomcat/modules:ro"
-    
-    transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:2.3.6
-    
-    share:
-        build: ./alfresco-share/docker
-        image: local/alfresco-share:6.2.2
-        mem_limit: 512m
-        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:ro"
-    
-    postgres-acs:
-        image: postgres:11.7
-        mem_limit: 512m
-        environment:
-            - POSTGRES_PASSWORD=alfresco
-            - POSTGRES_USER=alfresco
-            - POSTGRES_DB=alfresco
-        command: postgres -c max_connections=300 -c log_min_messages=LOG
-    
-    search:
-        image: alfresco/alfresco-search-services:2.0.1
-        mem_limit: 2g
-        environment:
-            - SOLR_ALFRESCO_HOST=platform
-            - SOLR_ALFRESCO_PORT=8080
-            - SOLR_SOLR_HOST=search
-            - SOLR_SOLR_PORT=8983
-            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
-            - ALFRESCO_SECURE_COMMS=none
-
-    activemq:
-        image: alfresco/alfresco-activemq:5.15.8
-        mem_limit: 256m
-
-    proxy:
-        build: ./nginx-ingress
-        image: local/nginx-ingress:acs-share
-        ports:
-            - 8080:8080
-        depends_on:
-            - platform
-            - share

download-jsconsole.ps1

@@ -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}'"

download-jsconsole.sh

@@ -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}"

nginx-ingress/Dockerfile

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

nginx-ingress/entrypoint.sh

@@ -1,15 +0,0 @@
-#!/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;"

nginx-ingress/nginx.conf

@@ -1,59 +0,0 @@
-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;
-        }
-    }
-}