Merge branch 'aps-base' into aps-persist-base

.env

@@ -4,3 +4,6 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
+
+APS_TAG=2.4.1
+POSTGRES_TAG=13

alfresco-content-repository/docker/Dockerfile

@@ -1,16 +0,0 @@
-FROM alfresco/alfresco-content-repository:latest
-
-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:latest
-
-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,59 +1,55 @@
-# 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: "2"
+version: "3"
 
 services:
-    platform:
-        build: ./alfresco-content-repository/docker
-        image: local/alfresco-content-repository:latest
+
+    activiti-app:
+        image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
         environment:
-            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\"
-                "
+            ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
         depends_on:
-            - postgres-acs
-            - activemq
+            - postgres-aps
         volumes:
-            - "./alfresco-content-repository/modules:/usr/local/tomcat/modules:ro"
+            - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
+            - apsbin-volume:/var/lib/postgresql/data:rw
     
-    share:
-        build: ./alfresco-share/docker
-        image: local/alfresco-share:latest
+    activiti-admin:
+        image: quay.io/alfresco/alfresco-process-services-admin:${APS_TAG}
         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}
-                "
+            ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti-admin?characterEncoding=UTF-8'
+            ACTIVITI_ADMIN_REST_APP_HOST: http://activiti-app
+        depends_on:
+            - postgres-aps-admin
+            - activiti-app
+    
+    postgres-aps:
+        image: postgres:${POSTGRES_TAG}
+        environment:
+            POSTGRES_DB: activiti
         volumes:
-            - "./alfresco-share/modules:/usr/local/tomcat/modules:ro"
+            - apsdb-volume:/var/lib/postgresql/data:rw
     
-    postgres-acs:
-        image: postgres:latest
-
-    activemq:
-        image: alfresco/alfresco-activemq:latest
+    postgres-aps-admin:
+        image: postgres:${POSTGRES_TAG}
+        environment:
+            POSTGRES_DB: activiti-admin
+        volumes:
+            - apsadmindb-volume:/var/lib/postgresql/data:rw
 
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-share
+        image: local/nginx-ingress:aps
         ports:
             - 8080:8080
         depends_on:
-            - platform
-            - share
+            - activiti-app
+            - activiti-admin
+
+volumes:
+    apsbin-volume:
+        driver: local
+    apsdb-volume:
+        driver: local
+    apsadmindb-volume:
+        driver: local

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

@@ -1,11 +1,11 @@
 #!/bin/sh
 
-if [[ $ACS_PLATFORM_URL ]]; then
-  sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
+if [[ $APS_APP_URL ]]; then
+  sed -i s%http:\/\/activiti-app:8080%"$APS_APP_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
+if [[ $APS_ADMIN_URL ]]; then
+  sed -i s%http:\/\/activiti-admin:8080%"$APS_ADMIN_URL"%g /etc/nginx/nginx.conf
 fi
 
 if [[ $ACCESS_LOG ]]; then

nginx-ingress/nginx.conf

@@ -39,18 +39,18 @@ http {
         location ~ ^(/.*/s/prometheus)$ {return 403;}
         
         location / {
-            proxy_pass http://platform:8080;
+            return 301 $scheme://$http_host/activiti-app;
         }
 
-        location /alfresco/ {
-            proxy_pass http://platform:8080;
+        location /activiti-app/ {
+            proxy_pass http://activiti-app:8080;
 
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;
         }
 
-        location /share/ {
-            proxy_pass http://share:8080;
+        location /activiti-admin/ {
+            proxy_pass http://activiti-admin: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