-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
13 changed files
with
167 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
activiti-app-overlay-docker/src/main/docker/Dockerfile-2.3.7
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| FROM alfresco/process-services:${aps.docker.version} | ||
|
|
||
| ENV ACTIVITI_DATASOURCE_USERNAME: ${docker.aps.database.username} | ||
| ENV ACTIVITI_DATASOURCE_PASSWORD: ${docker.aps.database.password} | ||
| ENV ACTIVITI_DATASOURCE_DRIVER: ${docker.aps.database.driver} | ||
| ENV ACTIVITI_HIBERNATE_DIALECT: ${docker.aps.database.dialect} | ||
| ENV ACTIVITI_DATASOURCE_URL: ${docker.aps.database.url} | ||
| ENV ACTIVITI_CSRF_DISABLED: ${docker.aps.database.csrf.disabled} | ||
| ENV ACTIVITI_CORS_ENABLED: ${docker.aps.database.cors.enabled} | ||
| ENV ACTIVITI_ES_SERVER_TYPE: ${docker.aps.es.server.type} | ||
| ENV ACTIVITI_ES_DISCOVERY_HOSTS: ${docker.aps.es.discovery.host} | ||
| ENV ACTIVITI_ES_CLUSTER_NAME: ${docker.aps.es.cluster.name} | ||
|
|
||
| ARG TOMCAT_DIR=/usr/local/tomcat | ||
| ARG USERNAME=alfresco | ||
| ARG CONTENT_STORAGE_DIR=/act_data | ||
|
|
||
| USER root | ||
|
|
||
| RUN rm -rf $TOMCAT_DIR/webapps/activiti-app | ||
|
|
||
| #COPY --chown=${USERNAME} extensions/aps-extensions-jar-${project.version}.jar $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} extensions/activiti-app.war $TOMCAT_DIR/webapps | ||
|
|
||
| COPY --chown=${USERNAME} license/*.* $TOMCAT_DIR/lib/ | ||
|
|
||
| RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat | ||
|
|
||
| RUN mkdir -p ${CONTENT_STORAGE_DIR} | ||
| RUN chown ${USERNAME}:${USERNAME} ${CONTENT_STORAGE_DIR} | ||
|
|
||
| USER ${USERNAME} |
40 changes: 40 additions & 0 deletions
40
activiti-app-overlay-docker/src/main/docker/Dockerfile-2.3.7-arm64
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| FROM tomcat:9-jdk11-openjdk | ||
|
|
||
| ENV ACTIVITI_DATASOURCE_USERNAME: ${docker.aps.database.username} | ||
| ENV ACTIVITI_DATASOURCE_PASSWORD: ${docker.aps.database.password} | ||
| ENV ACTIVITI_DATASOURCE_DRIVER: ${docker.aps.database.driver} | ||
| ENV ACTIVITI_HIBERNATE_DIALECT: ${docker.aps.database.dialect} | ||
| ENV ACTIVITI_DATASOURCE_URL: ${docker.aps.database.url} | ||
| ENV ACTIVITI_CSRF_DISABLED: ${docker.aps.database.csrf.disabled} | ||
| ENV ACTIVITI_CORS_ENABLED: ${docker.aps.database.cors.enabled} | ||
| ENV ACTIVITI_ES_SERVER_TYPE: ${docker.aps.es.server.type} | ||
| ENV ACTIVITI_ES_DISCOVERY_HOSTS: ${docker.aps.es.discovery.host} | ||
| ENV ACTIVITI_ES_CLUSTER_NAME: ${docker.aps.es.cluster.name} | ||
|
|
||
| ARG TOMCAT_DIR=/usr/local/tomcat | ||
| ARG USERNAME=alfresco | ||
| ARG USERID=33007 | ||
| ARG CONTENT_STORAGE_DIR=/act_data | ||
|
|
||
| USER root | ||
|
|
||
| RUN useradd -c "Alfresco APS" -M -s "/bin/bash" -u "${USERID}" -o "${USERNAME}" | ||
|
|
||
| RUN rm -rf $TOMCAT_DIR/webapps/activiti-app | ||
|
|
||
| #COPY --chown=${USERNAME} extensions/aps-extensions-jar-${project.version}.jar $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} extensions/activiti-app.war $TOMCAT_DIR/webapps | ||
|
|
||
| COPY --chown=${USERNAME} license/*.* $TOMCAT_DIR/lib/ | ||
|
|
||
| RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat | ||
|
|
||
| RUN mkdir -p ${CONTENT_STORAGE_DIR} | ||
| RUN chown ${USERNAME}:${USERNAME} ${CONTENT_STORAGE_DIR} | ||
|
|
||
| USER ${USERNAME} |
14 changes: 14 additions & 0 deletions
14
activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.3.7
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| FROM alfresco/process-services-admin:${aps.docker.version} | ||
|
|
||
| ARG TOMCAT_DIR=/usr/local/tomcat | ||
| ARG USERNAME=alfresco | ||
|
|
||
| USER root | ||
|
|
||
| ADD --chown=${USERNAME} jdbc $TOMCAT_DIR/lib | ||
| COPY --chown=${USERNAME} properties/activiti-admin.properties $TOMCAT_DIR/lib | ||
| COPY --chown=${USERNAME} tomcat/conf/server.xml $TOMCAT_DIR/conf | ||
|
|
||
| RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat | ||
|
|
||
| USER ${USERNAME} |
18 changes: 18 additions & 0 deletions
18
activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.3.7-arm64
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| FROM tomcat:9-jdk11-openjdk-slim | ||
|
|
||
| ARG TOMCAT_DIR=/usr/local/tomcat | ||
| ARG USERNAME=alfresco | ||
| ARG USERID=33007 | ||
|
|
||
| USER root | ||
|
|
||
| RUN useradd -c "Alfresco APS" -M -s "/bin/bash" -u "${USERID}" -o "${USERNAME}" | ||
|
|
||
| ADD --chown=${USERNAME} jdbc $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} tomcat/conf/server.xml $TOMCAT_DIR/conf | ||
|
|
||
| RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat | ||
|
|
||
| USER ${USERNAME} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
aps-extensions-jar/src/test/resources/activiti/2.3.7/version.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| type=bpmSuite | ||
| version.major=2 | ||
| version.minor=3 | ||
| version.revision=7 | ||
| version.edition=Alfresco Process Services (powered by Activiti) |
2 changes: 1 addition & 1 deletion
2
aps-extensions-jar/src/test/resources/activiti/version.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| type=bpmSuite | ||
| version.major=2 | ||
| version.minor=3 | ||
| version.revision=6 | ||
| version.revision=7 | ||
| version.edition=Alfresco Process Services (powered by Activiti) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters