added support for APS 2.1

Author: OpenPj

.gitignore

@@ -0,0 +1,3 @@
+.project
+.classpath
+.settings/

Dockerfile

@@ -1,17 +1,25 @@
-FROM alfresco/process-services:2.1.0
+FROM tomcat:9.0.56-jdk11-openjdk
 
 ARG TOMCAT_DIR=/usr/local/tomcat
+ARG USERNAME=alfresco
+ARG USERID=33007
 
 USER root
 
-#Uncomment the following lines for deploying extensions
-#RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
-#COPY extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/webapps/activiti-app/WEB-INF/lib
-#COPY extensions/activiti-app.war $TOMCAT_DIR/webapps
+RUN useradd -c "Alfresco APS" -M -s "/bin/bash" -u "${USERID}" -o "${USERNAME}"
 
-COPY logging/logback.xml $TOMCAT_DIR/lib
+RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
 
-COPY properties/activiti-app.properties $TOMCAT_DIR/lib
-COPY properties/activiti-ldap.properties $TOMCAT_DIR/lib
+#Uncomment below if you need to deploy an APS Extensions JAR
+#COPY --chown=${USERNAME} extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
 
-COPY activiti-license/*.* $TOMCAT_DIR/lib/
+COPY --chown=${USERNAME} jdbc-driver/*.* $TOMCAT_DIR/lib
+COPY --chown=${USERNAME} logging/logback.xml $TOMCAT_DIR/lib
+COPY --chown=${USERNAME} properties/activiti-app.properties $TOMCAT_DIR/lib
+COPY --chown=${USERNAME} properties/activiti-ldap.properties $TOMCAT_DIR/lib
+COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps
+COPY --chown=${USERNAME} activiti-license/*.* $TOMCAT_DIR/lib/
+
+RUN chown ${USERNAME}:${USERNAME} -R ${TOMCAT_DIR}
+
+USER ${USERNAME}

Dockerfile-admin

@@ -1,8 +1,18 @@
-FROM alfresco/process-services-admin:2.1.0
+FROM tomcat:9.0.56-jdk11-openjdk-slim
 
 ARG TOMCAT_DIR=/usr/local/tomcat
+ARG USERNAME=alfresco
+ARG USERID=33007
 
 USER root
 
-COPY properties/activiti-admin.properties $TOMCAT_DIR/lib
-COPY admin/tomcat/conf/server.xml $TOMCAT_DIR/conf
+RUN useradd -c "Alfresco APS" -M -s "/bin/bash" -u "${USERID}" -o "${USERNAME}"
+
+COPY --chown=${USERNAME} jdbc-driver/*.* $TOMCAT_DIR/lib
+COPY --chown=${USERNAME} extensions/activiti-admin.war $TOMCAT_DIR/webapps
+COPY --chown=${USERNAME} properties/activiti-admin.properties $TOMCAT_DIR/lib
+COPY --chown=${USERNAME} admin/tomcat/conf/server.xml $TOMCAT_DIR/conf
+
+RUN chown ${USERNAME}:${USERNAME} -R ${TOMCAT_DIR}
+
+USER ${USERNAME}

README.md

@@ -1,11 +1,10 @@
-lucastancapiano@MacBook-Pro alfresco-process-services-docker-deployment % cat README.md 
 # Alfresco Process Services Docker Deployment
 Docker Compose template for deploying the Alfresco Process Services Platform.
 
 The goal of this project is to help system administrators to manage a APS infrastructure deployed with Docker where they also need to configure parameters or install extensions.
 For developers interested to build extensions please see the [Alfresco Process Services SDK](https://github.com/OpenPj/alfresco-process-services-project-sdk).
 
-The architecture template will deploy for you the following components:
+The architecture template will help you deploying APS for you with the following tested components:
 
 * activiti-app 2.1.0
 * activiti-admin 2.1.0
@@ -14,10 +13,10 @@ The architecture template will deploy for you the following components:
 
 Each component will have its own Docker Volume for managing the storage:
 
-* `aps-db-volume`: database storage for activiti-app
-* `aps-contentstore-volume`: contentstore for attachments
-* `aps-es-volume`: file storage for search indexes
-* `aps-admin-db-volume`: database storage for activiti-admin
+* `aps-db-sa-volume`: database storage for activiti-app
+* `aps-contentstore-sa-volume`: file storage for attachments
+* `aps-es-sa-volume`: file storage for search indexes
+* `aps-admin-db-sa-volume`: database storage for activiti-admin
 
 The provided run script will create these volumes for you.
 
@@ -40,7 +39,7 @@ Before using this project you have to configure the following components:
 
 ```
 $ docker -v
-Docker version 20.10.8, build afacb8b
+Docker version 20.10.12, build e91ed57
 ``` 
 
 3. Docker Compose is included as part of Windows and Mac Docker installers.
@@ -53,25 +52,28 @@ For Linux-based users, install both the component separately with the following:
 
 ```
 $ docker-compose -v
-docker-compose version 1.29.2, build 8a1c60f6
+docker-compose version 2.2.3
 ```
 
-### APS Valid License
+### APS WAR artifacts, extensions and licensing
 
-Put your license in the activiti-license folder.
+1. Put your license in the `activiti-license` folder
+2. Put the JDBC driver used by APS in the `jdbc-driver` folder
+3. Put your activiti-app.war and activiti-admin.war in the `extensions` folder
 
 ## Configuration
 
 The structure of the project allows you to configure and install extensions against the APS platform as the following:
 
 * `admin/tomcat/conf`: put here all the Tomcat configuration files
+* `jdbc-driver`: put here the JDBC driver for Activiti App and Activiti Admin
 * `logging`: change your logging strategy here using logback.xml
 * `properties`: change here your activiti-app and activiti-admin properties
 * `activiti-license`: put here your valid APS license
 * `docker-compose.yml`: change here your deployment structure
 * `Dockerfile`: change here your container build for activiti-app
 * `Dockerfile-admin`: change here your continer build for activiti-admin
-* `extensions`: put here your extensions (JARs or activiti-app.war)
+* `extensions`: put here your Activiti App, Activiti Admin and extensions (activiti-app.war, activiti-admin.war, extensions JARs)
 
 For more informations about how to build extensions please see [Alfresco Process Services SDK](https://github.com/OpenPj/alfresco-process-services-project-sdk).
 
@@ -104,5 +106,4 @@ Return in tail with:
 
 ```
 ./run.sh tail
-```
-lucastancapiano@MacBook-Pro alfresco-process-services-docker-deployment % 
+```

docker-compose.yml

@@ -1,35 +1,42 @@
-version: '3.8'
+version: '3.9'
 services:
   process:
     build: .
+    hostname: process
+    container_name: aps_process
+    networks:
+     - aps-network    
     environment:
-      JAVA_OPTS: " -Xms256m -Xmx1g"
+     JAVA_OPTS: " -Xms256m -Xmx1g"
     ports:
     - 8080:8080
-    links:
-      - postgres:postgres
-      - elasticsearch:elasticsearch
     depends_on:
       - postgres
       - elasticsearch
+      - process-admin
     volumes:
-      - aps-contentstore-volume:/act_data
+      - aps-contentstore-sa-volume:/act_data
 
   process-admin:
     build:
       context: .
       dockerfile: Dockerfile-admin
+    hostname: process-admin
+    container_name: aps_process_admin
+    networks:
+     - aps-network  
     environment:
       JAVA_OPTS: " -Xms256m -Xmx512m"
     ports:
     - 9090:9090
-    links:
-      - postgres-admin:postgres-admin
-      - process:process
     depends_on:
       - postgres-admin
 
   elasticsearch:
+    hostname: elasticsearch
+    container_name: aps_elasticsearch
+    networks:
+     - aps-network  
     image: elasticsearch:7.13.2
     environment:
       discovery.type: single-node
@@ -38,9 +45,13 @@ services:
       - 9300:9300
       - 9200:9200
     volumes:
-      - aps-es-volume:/usr/share/elasticsearch/data
+      - aps-es-sa-volume:/usr/share/elasticsearch/data
 
   postgres:
+    hostname: postgres
+    container_name: aps_postgres
+    networks:
+     - aps-network  
     image: postgres:13.1
     environment:
       POSTGRES_DB: activiti
@@ -49,9 +60,13 @@ services:
     ports:
       - 5432:5432
     volumes:
-      - aps-db-volume:/var/lib/postgresql/data
+      - aps-db-sa-volume:/var/lib/postgresql/data
 
   postgres-admin:
+     hostname: postgres-admin
+     container_name: aps_postgres_admin
+     networks:
+     - aps-network  
      image: postgres:13.1
      environment:
        POSTGRES_DB: activiti-admin
@@ -62,15 +77,19 @@ services:
      expose:
      - "5433"
      volumes:
-       - aps-admin-db-volume:/var/lib/postgresql/data
+       - aps-admin-db-sa-volume:/var/lib/postgresql/data
      command: -p 5433
 
+networks:
+    aps-network:
+     name: aps-network
+
 volumes:
-    aps-db-volume:
+    aps-db-sa-volume:
       external: true
-    aps-admin-db-volume:
+    aps-admin-db-sa-volume:
       external: true
-    aps-contentstore-volume:
+    aps-contentstore-sa-volume:
       external: true
-    aps-es-volume:
+    aps-es-sa-volume:
       external: true

extensions/README.md

@@ -1,3 +1,3 @@
 # Extensions
 
-Put here your APS extensions (activiti-extensions.jar or activiti-app.war)
+Put here your activiti-app and activiti-admin WARs and APS extensions (activiti-app.war, activiti-admin.war and activiti-extensions.jar)

jdbc-driver/README.md

@@ -0,0 +1,3 @@
+# Extensions
+
+Put here the JDBC driver used by Activiti App and Activiti Admin

run.bat

@@ -29,10 +29,10 @@ echo "Usage: %0 {start|stop|purge|tail}"
 EXIT /B %ERRORLEVEL%
 
 :start
-    docker volume create aps-db-volume
-    docker volume create aps-admin-db-volume
-    docker volume create aps-contentstore-volume
-	docker volume create aps-es-volume
+    docker volume create aps-db-sa-volume
+    docker volume create aps-admin-db-sa-volume
+    docker volume create aps-contentstore-sa-volume
+	docker volume create aps-es-sa-volume
     docker-compose up --build -d
 EXIT /B 0
 :down
@@ -45,8 +45,8 @@ EXIT /B 0
     docker-compose logs --tail="all"
 EXIT /B 0
 :purge
-    docker volume rm aps-db-volume
-    docker volume rm aps-admin-db-volume
-    docker volume rm aps-contentstore-volume
-	docker volume rm aps-es-volume
+    docker volume rm aps-db-sa-volume
+    docker volume rm aps-admin-db-sa-volume
+    docker volume rm aps-contentstore-sa-volume
+	docker volume rm aps-es-sa-volume
 EXIT /B 0

run.sh

@@ -1,10 +1,10 @@
 #!/bin/sh
 
 start() {
-    docker volume create aps-db-volume
-    docker volume create aps-admin-db-volume
-    docker volume create aps-contentstore-volume
-	docker volume create aps-es-volume
+    docker volume create aps-db-sa-volume
+    docker volume create aps-admin-db-sa-volume
+    docker volume create aps-contentstore-sa-volume
+	docker volume create aps-es-sa-volume
     docker-compose up --build -d
 }
 
@@ -13,10 +13,10 @@ down() {
 }
 
 purge() {
-    docker volume rm aps-db-volume
-    docker volume rm aps-admin-db-volume
-    docker volume rm aps-contentstore-volume
-	docker volume rm aps-es-volume
+    docker volume rm aps-db-sa-volume
+    docker volume rm aps-admin-db-sa-volume
+    docker volume rm aps-contentstore-sa-volume
+	docker volume rm aps-es-sa-volume
 }
 
 tail() {