updated RAD docker image/config

This commit is contained in:
2021-06-01 13:26:23 -04:00
parent a889607c48
commit 3777dad5c8
10 changed files with 38 additions and 6 deletions

View File

@@ -57,6 +57,8 @@
<skip>${skipTests}</skip>
<env>
<JAVA_MEMORY_MAX>${acs-platform.memory}</JAVA_MEMORY_MAX>
<ENABLE_JDWP>false</ENABLE_JDWP>
<ENABLE_HOTSWAP>false</ENABLE_HOTSWAP>
<CATALINA_OPTS>-Ddir.root=/tmp/alf_data -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \
-Dmessaging.broker.url=failover:\(tcp://${project.artifactId}-acs-mq:61616\)?timeout\=3000\&amp;jms.useCompression\=true \
-Dtransform.service.enabled=${beedk.deploy.ats.enabled} -Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 -Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \
@@ -203,7 +205,7 @@
<!-- versions -->
<acs-postgres.version>9.6</acs-postgres.version>
<acs-activemq.version>5.15.8</acs-activemq.version>
<tomcat-rad.version>9-1.3</tomcat-rad.version>
<tomcat-rad.version>9-1.4</tomcat-rad.version>
</properties>
</profile>
</profiles>

View File

@@ -49,6 +49,8 @@ The following properties are intended to be exposed by inheriting Public API Mav
| Maven Property | Required | Default | Description |
| -------------------------- |:--------:| --------------- | ----------- |
| `acs-platform.hotswap.enabled` | | true | Enable the HotSwap Agent for live classpath reloading. |
| `acs-platform.debugger.enabled` | | true | Enable the JDWP debugger. |
| `acs-platform.port` | | 8080 | The port to expose on `localhost` for the developer; not for other applications or users. |
| `acs-postgres.port` | | 5432 | The port to expose on `localhost` for the developer; not for other applications or users. |
| `acs-activemq.port` | | 8161 | The port to expose on `localhost` for the developer; not for other applications or users. |

View File

@@ -103,6 +103,8 @@
<run>
<env>
<JAVA_MEMORY_MAX>${acs-platform.memory}</JAVA_MEMORY_MAX>
<ENABLE_JDWP>${acs-platform.debugger.enabled}</ENABLE_JDWP>
<ENABLE_HOTSWAP>${acs-platform.hotswap.enabled}</ENABLE_HOTSWAP>
<CATALINA_OPTS>-Ddir.root=/tmp/alf_data -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \
-Dmessaging.broker.url=failover:\(tcp://${project.artifactId}-acs-mq:61616\)?timeout\=3000\&amp;jms.useCompression\=true \
-Dtransform.service.enabled=${beedk.rad.ats.enabled} -Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 -Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \
@@ -230,6 +232,8 @@
<beedk.deploy.platform.warDirectory>${project.build.warDirectory}</beedk.deploy.platform.warDirectory>
<acs-platform.timeout>150000</acs-platform.timeout>
<acs-platform.memory>1g</acs-platform.memory>
<acs-platform.debugger.enabled>true</acs-platform.debugger.enabled>
<acs-platform.hotswap.enabled>true</acs-platform.hotswap.enabled>
<acs-api-explorer.war.groupId>org.alfresco</acs-api-explorer.war.groupId>
<acs-api-explorer.war.artifactId>api-explorer</acs-api-explorer.war.artifactId>
<acs-api-explorer.war.version>${acs-api-explorer.version}</acs-api-explorer.war.version>
@@ -247,7 +251,7 @@
<acs-aos.war.version>1.3.2.1</acs-aos.war.version>
<acs-postgres.version>9.6</acs-postgres.version>
<acs-activemq.version>5.15.8</acs-activemq.version>
<tomcat-rad.version>9-1.3</tomcat-rad.version>
<tomcat-rad.version>9-1.4</tomcat-rad.version>
</properties>
</profile>
</profiles>

View File

@@ -85,6 +85,10 @@
<alias>acs-share</alias>
<run>
<skip>${skipTests}</skip>
<env>
<ENABLE_JDWP>false</ENABLE_JDWP>
<ENABLE_HOTSWAP>false</ENABLE_HOTSWAP>
</env>
<ports>
<port>${acs-share.port}:8080</port>
</ports>
@@ -148,7 +152,7 @@
<acs-share.port>8180</acs-share.port>
<!-- versions -->
<tomcat-rad.version>9-1.3</tomcat-rad.version>
<tomcat-rad.version>9-1.4</tomcat-rad.version>
<!-- configuring beedk-acs-webapp-artifact-tile -->
<alfresco.war.artifactId>share</alfresco.war.artifactId>

View File

@@ -53,6 +53,8 @@ The following properties are intended to be exposed by inheriting Public API Mav
| `alfresco.war.version` | *Maybe* | *See Below* | The Maven `version` of a Maven `war` Type Project defined in a Maven Repository.<br/>*Inherited from [`beedk-acs-webapp-artifact-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-webapp-artifact-tile)* |
| `project.build.shareExtDirectory` | | `${project.build.directory}/ext/share` | An additional directory of JARs to add to the ACS Share at runtime. |
| `acs-platform.url` | | *See Below* | The URL of the backend ACS Platform to be used. |
| `acs-share.hotswap.enabled` | | true | Enable the HotSwap Agent for live classpath reloading. |
| `acs-share.debugger.enabled` | | true | Enable the JDWP debugger. |
| `acs-share.port` | | 8180 | The port to expose on `localhost` for the developer; not for other applications or users. |
| `acs-share.debugger.port` | | 8100 | The port to expose on `localhost` for the developer; not for other applications or users. |
| `acs-share.timeout` | | 45000 | The time to wait for the startup to complete, in milliseconds. |

View File

@@ -93,6 +93,10 @@
<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
<alias>acs-share</alias>
<run>
<env>
<ENABLE_JDWP>${acs-share.debugger.enabled}</ENABLE_JDWP>
<ENABLE_HOTSWAP>${acs-share.hotswap.enabled}</ENABLE_HOTSWAP>
</env>
<ports>
<port>${acs-share.port}:8080</port>
<port>${acs-share.debugger.port}:8000</port>
@@ -140,6 +144,8 @@
<properties>
<!-- configurable -->
<acs-platform.url>http://${project.artifactId}-acs-platform:8080</acs-platform.url>
<acs-share.hotswap.enabled>true</acs-share.hotswap.enabled>
<acs-share.debugger.enabled>true</acs-share.debugger.enabled>
<acs-share.debugger.port>8100</acs-share.debugger.port>
<acs-share.timeout>45000</acs-share.timeout>
<project.build.shareExtDirectory>${project.build.directory}/ext/share</project.build.shareExtDirectory>
@@ -148,7 +154,7 @@
<acs-share.port>8180</acs-share.port>
<!-- versions -->
<tomcat-rad.version>9-1.3</tomcat-rad.version>
<tomcat-rad.version>9-1.4</tomcat-rad.version>
<!-- configuring beedk-acs-webapp-artifact-tile -->
<alfresco.war.artifactId>share</alfresco.war.artifactId>

View File

@@ -52,6 +52,8 @@ The following properties are intended to be exposed by inheriting Public API Mav
| `aps.war.groupId` | | `org.alfresco` | |
| `aps.war.artifactId` | | `activiti-app` | |
| `aps.war.version` | **Yes** | | |
| `aps.hotswap.enabled` | | true | Enable the HotSwap Agent for live classpath reloading. |
| `aps.debugger.enabled` | | true | Enable the JDWP debugger. |
| `aps.port` | | 8080 | The port to expose on `localhost` for the developer; not for other applications or users. |
| `aps-postgres.port` | | 5432 | The port to expose on `localhost` for the developer; not for other applications or users. |
| `aps.debugger.port` | | 8000 | The port to expose on `localhost` for the developer; not for other applications or users. |

View File

@@ -73,6 +73,8 @@
<run>
<env>
<JAVA_MEMORY_MAX>${aps.memory}</JAVA_MEMORY_MAX>
<ENABLE_HOTSWAP>${aps.hotswap.enabled}</ENABLE_HOTSWAP>
<ENABLE_JDWP>${aps.debugger.enabled}</ENABLE_JDWP>
<CATALINA_OPTS>-Ddir.root=/tmp/alf_data -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \
-Dmessaging.broker.url=failover:\(tcp://${project.artifactId}-acs-mq:61616\)?timeout\=3000\&amp;jms.useCompression\=true \
-Dtransform.service.enabled=${beedk.rad.ats.enabled} -Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 -Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \
@@ -147,6 +149,8 @@
<beedk.deploy.aps.warDirectory>${project.build.warDirectory}</beedk.deploy.aps.warDirectory>
<aps.timeout>60000</aps.timeout>
<aps.memory>512m</aps.memory>
<aps.hotswap.enabled>true</aps.hotswap.enabled>
<aps.debugger.enabled>true</aps.debugger.enabled>
<!-- ports -->
<aps-postgres.port>5432</aps-postgres.port>
@@ -155,7 +159,7 @@
<!-- versions -->
<aps.version>1.11.1.1</aps.version>
<tomcat-rad.version>9-1.3</tomcat-rad.version>
<tomcat-rad.version>9-1.4</tomcat-rad.version>
<!-- results -->
<project.build.warFile>${project.build.warDirectory}/${aps.war.artifactId}-${aps.war.version}.war</project.build.warFile>

View File

@@ -57,6 +57,8 @@ The following properties are intended to be exposed by inheriting Public API Mav
| `ate.app.className` | **Yes** | | The Java class name of the @SpringBootApplication annotated class. |
| `ate.docker.image.name` | **Yes** | | The Docker image name of the ATE, including the Docker registry host if applicable. |
| `ate.docker.image.tag` | | `latest` | The Docker image tag (version) of the ATE. |
| `ate.hotswap.enabled` | | true | Enable the HotSwap Agent for live classpath reloading. |
| `ate.debugger.enabled` | | true | Enable the JDWP debugger. |
| `ate.port` | | 8080 | The port to expose on `localhost` for the developer; not for other applications. |
| `ate.debugger.port` | | 8001 | The port to expose on `localhost` for the developer; not for other applications. |
| `ate.timeout` | | 20000 | The time to wait for the startup to complete, in milliseconds. |

View File

@@ -49,6 +49,8 @@
<run>
<env>
<JAVA_CLASS>${ate.app.className}</JAVA_CLASS>
<ENABLE_HOTSWAP>${ate.hotswap.enabled}</ENABLE_HOTSWAP>
<ENABLE_JDWP>${ate.debugger.enabled}</ENABLE_JDWP>
</env>
<ports>
<port>${ate.port}:8090</port>
@@ -94,12 +96,14 @@
<!-- configurable -->
<ate.docker.image.tag>latest</ate.docker.image.tag>
<ate.port>8090</ate.port>
<ate.hotswap.enabled>true</ate.hotswap.enabled>
<ate.debugger.enabled>true</ate.debugger.enabled>
<ate.debugger.port>8001</ate.debugger.port>
<ate.timeout>20000</ate.timeout>
<beedk.deploy.ate.extDirectory>${project.build.directory}/libs</beedk.deploy.ate.extDirectory>
<!-- versions -->
<java-dcevm-hotswap.version>11.0.10-1.4.1</java-dcevm-hotswap.version>
<java-dcevm-hotswap.version>11.0.11-1.4.1</java-dcevm-hotswap.version>
</properties>
</profile>
</profiles>