Several fixes

Author: rjptegelaar

docker-compose.yml

@@ -17,12 +17,7 @@ services:
       - SQL_SERVER_USER=talendsam
       - SQL_SERVER_PASSWORD=talendsam1234
       - TALEND_SAM_USER_PASSWORD=HeyHoLetsGO!
-      - TALEND_ADMIN_USER_PASSWORD=WeAreGoingToIbiza
-    healthcheck:
-       test: ["CMD", "curl", "-f", "http://localhost:8040/services"]
-       interval: 30s
-       timeout: 10s
-       retries: 5
+      - TALEND_ADMIN_USER_PASSWORD=WeAreGoingToIbiza    
 
   serviceruntime01:
     image: paultegelaar/talend74service:20201015_1726-V7.4.1M3
@@ -42,11 +37,6 @@ services:
       - TALEND_SAM_USER_PASSWORD=HeyHoLetsGO!
       - TALEND_ADMIN_USER_PASSWORD=WeAreGoingToIbiza
       - START_DELAY=15
-    healthcheck:
-        test: ["CMD", "curl", "-f", "http://localhost:8043/services"]
-        interval: 30s
-        timeout: 10s
-        retries: 5
 
   processruntime01:
     image: paultegelaar/talend74process:20201015_1726-V7.4.1M3
@@ -66,11 +56,6 @@ services:
       - TALEND_SAM_USER_PASSWORD=HeyHoLetsGO!
       - TALEND_ADMIN_USER_PASSWORD=WeAreGoingToIbiza
       - START_DELAY=30
-    healthcheck:
-       test: ["CMD", "curl", "-f", "http://localhost:8042/services"]
-       interval: 30s
-       timeout: 10s
-       retries: 5    
 
   apiruntime01:
     image: paultegelaar/talend74api:20201015_1726-V7.4.1M3
@@ -90,12 +75,7 @@ services:
       - TALEND_SAM_USER_PASSWORD=HeyHoLetsGO!
       - TALEND_ADMIN_USER_PASSWORD=WeAreGoingToIbiza
       - START_DELAY=30
-    healthcheck:
-       test: ["CMD", "curl", "-f", "http://localhost:8041/services"]
-       interval: 30s
-       timeout: 10s
-       retries: 5
-         
+               
 networks:
   talend_network:
     driver: bridge

talend-infra-sqlserver/src/main/assembly/talend-deps.xml

@@ -1,5 +1,5 @@
 <assembly>
-	<id>liquid</id>
+	<id>talend-infra</id>
 	<formats>
 		<format>zip</format>
 	</formats>

talend-runtime-connected/Dockerfile

@@ -43,6 +43,7 @@ COPY scripts/configureSAM.sh $TALEND_CONTAINER_HOME/scripts
 COPY scripts/addUsers.sh $TALEND_CONTAINER_HOME/scripts
 COPY scripts/configureAndStartTalend.sh /opt/scripts
 COPY scripts/wait-centos.sh /opt/scripts
+COPY scripts/copyConfigsAndKars.sh /opt/scripts
 COPY scripts/startAndSwitchPorts.sh /opt/scripts
 COPY scripts/setenv $TALEND_CONTAINER_HOME/bin
 

talend-runtime-connected/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>nl.paultegelaar.talend.docker</groupId>
     <artifactId>talend74docker</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.2-SNAPSHOT</version>
   </parent>
   <artifactId>talend-runtime-connected</artifactId>
   <packaging>pom</packaging>

talend-runtime-connected/scripts/configureAndStartTalend.sh

@@ -20,6 +20,9 @@ echo "Stopping runtime"
 ./trun stop
 sleep 30
 echo "Stopped."
+echo "Deploying Talend logic."
+/opt/scripts/copyConfigsAndKars.sh
+echo "Deployed Talend logic."
 echo "Randomize passwords"
 sed -i "s/^[#]*\s*tadmin=.*/tadmin=`pwgen -Bs1 36`,_g_:admingroup,sl_admin,ssh/" $TALEND_CONTAINER_HOME/etc/users.properties
 sed -i "s/^[#]*\s*karaf =.*/karaf = `pwgen -Bs1 36`,_g_:admingroup/" $TALEND_CONTAINER_HOME/etc/users.properties

talend-runtime-connected/scripts/copyConfigsAndKars.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+#Unzip deployment package
+unzip /opt/talend.zip -d /opt 2>/dev/null
+
+#Move configs silently
+mv /opt/talend/config/*.cfg $TALEND_CONTAINER_HOME/etc 2>/dev/null
+
+#Sleep after configs
+sleep 2
+
+#Move jars silently
+mv /opt/talend/kars/*.jar $TALEND_CONTAINER_HOME/deploy 2>/dev/null
+
+#Sleep after jars
+sleep 2
+
+#Move kars silently
+mv /opt/talend/kars/*.kar $TALEND_CONTAINER_HOME/deploy 2>/dev/null