Merge branch 'acs' into acs-enterprise

.env

@@ -8,4 +8,3 @@ PROXY_PORT=8080
 ACS_TAG=7.4.1.1
 AAMQ_TAG=latest
 POSTGRES_TAG=13
-ACS_SHARE_TAG=7.4.1.2

README.md

@@ -3,3 +3,11 @@
 
 This Git Repository intends to represent environments in Docker Compose.  All environments are effectively a derivative of other environments.  The original environment is the environment represented by the `base` branch.  All derivative environments are represented by other branches.  Those branches are named in the format `{core}.{parent}`.
 
+## Licensing
+
+This version of Alfresco requires licensing.
+
+### ACS Enterprise
+
+The enterprise version of ACS requires a license file for it to work for more than 2 days.  This means it isn't really required, but it is becomes important when you utilize any `persist` branch.  For licensing to work, you must place your license file in the following directory relative to the user home directory that runs the Docker Compose command: `alfresco/license/acs`.  There must be just one file in there that ends in `.lic`.
+

alfresco-content-repository/docker/Dockerfile

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

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

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

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

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

@@ -5,11 +5,7 @@ version: "3"
 services:
 
     platform:
-        build:
-            context: ./alfresco-content-repository/docker
-            args:
-                ACS_TAG: ${ACS_TAG}
-        image: local/alfresco-content-repository:latest
+        image: quay.io/alfresco/alfresco-content-repository:${ACS_TAG}
         environment:
             JAVA_TOOL_OPTIONS: "
                 -Dencryption.keystore.type=JCEKS
@@ -19,56 +15,55 @@ services:
                 -Dmetadata-keystore.password=mp6yc0UD9e
                 -Dmetadata-keystore.aliases=metadata
                 -Dmetadata-keystore.metadata.password=oKIWzVdEdA
-                -Dmetadata-keystore.metadata.algorithm=DESede"
+                -Dmetadata-keystore.metadata.algorithm=DESede
+                "
             JAVA_OPTS: "
+                -Xms512m -Xmx1g
                 -Ddb.driver=org.postgresql.Driver
+                -Ddb.username=alfresco
+                -Ddb.password=alfresco
                 -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -Dshare.host=${PROXY_HOST}
-                -Dshare.port=${PROXY_PORT}
-                -Dshare.protocol=${PROXY_PROTOCOL}
+                -Dindex.subsystem.name=noindex
                 -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
+                -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=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/platform:ro"
-    
-    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"
+            - "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro"
     
     postgres-acs:
         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
 
     activemq:
         image: alfresco/alfresco-activemq:${AAMQ_TAG}
+        environment:
+            ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
+            ACTIVEMQ_ADMIN_LOGIN: alfresco
+            ACTIVEMQ_ADMIN_PASSWORD: alfresco
 
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-share
+        image: local/nginx-ingress:acs
         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/entrypoint.sh

@@ -4,10 +4,6 @@ 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-ingress/nginx.conf

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

scripts/download-maven-alfresco-private.bat

@@ -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% %*

scripts/download-maven-alfresco-private.ps1

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

scripts/download-maven-alfresco-private.sh

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

scripts/download-maven-alfresco-public.bat

@@ -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% %*

scripts/download-maven-alfresco-public.ps1

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

scripts/download-maven-alfresco-public.sh

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

scripts/download-maven-inteligr8-private.sh

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

scripts/download-maven-inteligr8-public.sh

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

scripts/download-maven.bat

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

scripts/download-maven.ps1

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

scripts/download-maven.sh

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

scripts/download-url.bat

@@ -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%
-)

scripts/download-url.ps1

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

scripts/download-url.sh

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

scripts/unpack.bat

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

scripts/unpack.ps1

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

scripts/unpack.sh

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