Fix container restart issue

.github/workflows/ca-container-basic-test.yml

@@ -312,6 +312,9 @@ jobs:
       - name: Restart CA
         run: |
           docker restart ca
+          sleep 10
+
+          docker network reload --all
 
           # wait for CA to restart
           docker exec client curl \

.github/workflows/ca-container-existing-certs-test.yml

@@ -403,7 +403,9 @@ jobs:
       - name: Restart CA
         run: |
           docker restart ca
-          sleep 5
+          sleep 10
+
+          docker network reload --all
 
           # wait for CA to restart
           docker exec client curl \

.github/workflows/kra-container-test.yml

@@ -487,7 +487,9 @@ jobs:
       - name: Restart CA
         run: |
           docker restart ca
-          sleep 5
+          sleep 10
+
+          docker network reload --all
 
           # wait for CA to restart
           docker exec client curl \
@@ -623,7 +625,9 @@ jobs:
       - name: Restart KRA
         run: |
           docker restart kra
-          sleep 5
+          sleep 10
+
+          docker network reload --all
 
           # wait for KRA to restart
           docker exec client curl \

.github/workflows/ocsp-container-test.yml

@@ -487,7 +487,9 @@ jobs:
       - name: Restart CA
         run: |
           docker restart ca
-          sleep 5
+          sleep 10
+
+          docker network reload --all
 
           # wait for CA to restart
           docker exec client curl \
@@ -645,7 +647,9 @@ jobs:
       - name: Restart OCSP
         run: |
           docker restart ocsp
-          sleep 5
+          sleep 10
+
+          docker network reload --all
 
           # wait for OCSP to restart
           docker exec client curl \

.github/workflows/server-container-test.yml

@@ -148,7 +148,9 @@ jobs:
       - name: Restart server
         run: |
           docker restart server
-          sleep 5
+          sleep 10
+
+          docker network reload --all
 
           # wait for server to restart
           docker exec client curl \

.github/workflows/tks-container-test.yml

@@ -428,7 +428,9 @@ jobs:
       - name: Restart TKS
         run: |
           docker restart tks
-          sleep 5
+          sleep 10
+
+          docker network reload --all
 
           # wait for TKS to restart
           docker exec client curl \

.github/workflows/tps-container-test.yml

@@ -415,7 +415,9 @@ jobs:
       - name: Restart CA
         run: |
           docker restart ca
-          sleep 5
+          sleep 10
+
+          docker network reload --all
 
           # wait for CA to restart
           docker exec client curl \
@@ -785,7 +787,9 @@ jobs:
       - name: Restart TPS
         run: |
           docker restart tps
-          sleep 5
+          sleep 10
+
+          docker network reload --all
 
           # wait for TPS to restart
           docker exec client curl \

base/ca/bin/pki-ca-run

@@ -361,15 +361,20 @@ rm /tmp/sslserver.crt
 echo "################################################################################"
 echo "INFO: Starting CA server"
 
+trap "kill -- -$(ps -o pgid= $PID | grep -o '[0-9]*')" TERM
+
 if [ "$UID" = "0" ]; then
     # In Docker the server runs as root user but it will switch
     # into pkiuser (UID=17) that belongs to the root group (GID=0).
-    pki-server run
-
+    pki-server run &
+    PID=$!
+    wait $PID
 else
     # In OpenShift/Podman the server runs as a non-root user
     # (with a random UID) that belongs to the root group (GID=0).
     #
     # https://www.redhat.com/en/blog/jupyter-on-openshift-part-6-running-as-an-assigned-user-id
-    pki-server run --as-current-user
+    pki-server run --as-current-user &
+    PID=$!
+    wait $PID
 fi

base/kra/bin/pki-kra-run

@@ -199,15 +199,20 @@ find /logs -type d -exec chmod +rwx -- {} +
 echo "################################################################################"
 echo "INFO: Starting KRA server"
 
+trap "kill -- -$(ps -o pgid= $PID | grep -o '[0-9]*')" TERM
+
 if [ "$UID" = "0" ]; then
     # In Docker the server runs as root user but it will switch
     # into pkiuser (UID=17) that belongs to the root group (GID=0).
-    pki-server run
-
+    pki-server run &
+    PID=$!
+    wait $PID
 else
     # In OpenShift/Podman the server runs as a non-root user
     # (with a random UID) that belongs to the root group (GID=0).
     #
     # https://www.redhat.com/en/blog/jupyter-on-openshift-part-6-running-as-an-assigned-user-id
-    pki-server run --as-current-user
+    pki-server run --as-current-user &
+    PID=$!
+    wait $PID
 fi

base/ocsp/bin/pki-ocsp-run

@@ -180,15 +180,20 @@ find /logs -type d -exec chmod +rwx -- {} +
 echo "################################################################################"
 echo "INFO: Starting OCSP server"
 
+trap "kill -- -$(ps -o pgid= $PID | grep -o '[0-9]*')" TERM
+
 if [ "$UID" = "0" ]; then
     # In Docker the server runs as root user but it will switch
     # into pkiuser (UID=17) that belongs to the root group (GID=0).
-    pki-server run
-
+    pki-server run &
+    PID=$!
+    wait $PID
 else
     # In OpenShift/Podman the server runs as a non-root user
     # (with a random UID) that belongs to the root group (GID=0).
     #
     # https://www.redhat.com/en/blog/jupyter-on-openshift-part-6-running-as-an-assigned-user-id
-    pki-server run --as-current-user
+    pki-server run --as-current-user &
+    PID=$!
+    wait $PID
 fi

base/server/bin/pki-server-run

@@ -228,15 +228,21 @@ rm /tmp/sslserver.crt
 echo "################################################################################"
 echo "INFO: Starting PKI server"
 
+trap "kill -- -$(ps -o pgid= $PID | grep -o '[0-9]*')" TERM
+
 if [ "$UID" = "0" ]; then
     # In Docker the server runs as root user but it will switch
     # into pkiuser (UID=17) that belongs to the root group (GID=0).
-    pki-server run
+    pki-server run &
+    PID=$!
+    wait $PID
 
 else
     # In OpenShift/Podman the server runs as a non-root user
     # (with a random UID) that belongs to the root group (GID=0).
     #
     # https://www.redhat.com/en/blog/jupyter-on-openshift-part-6-running-as-an-assigned-user-id
-    pki-server run --as-current-user
+    pki-server run --as-current-user &
+    PID=$!
+    wait $PID
 fi

base/tks/bin/pki-tks-run

@@ -161,15 +161,21 @@ find /logs -type d -exec chmod +rwx -- {} +
 echo "################################################################################"
 echo "INFO: Starting TKS server"
 
+trap "kill -- -$(ps -o pgid= $PID | grep -o '[0-9]*')" TERM
+
 if [ "$UID" = "0" ]; then
     # In Docker the server runs as root user but it will switch
     # into pkiuser (UID=17) that belongs to the root group (GID=0).
-    pki-server run
+    pki-server run &
+    PID=$!
+    wait $PID
 
 else
     # In OpenShift/Podman the server runs as a non-root user
     # (with a random UID) that belongs to the root group (GID=0).
     #
     # https://www.redhat.com/en/blog/jupyter-on-openshift-part-6-running-as-an-assigned-user-id
-    pki-server run --as-current-user
+    pki-server run --as-current-user &
+    PID=$!
+    wait $PID
 fi

base/tps/bin/pki-tps-run

@@ -168,15 +168,21 @@ find /logs -type d -exec chmod +rwx -- {} +
 echo "################################################################################"
 echo "INFO: Starting TPS server"
 
+trap "kill -- -$(ps -o pgid= $PID | grep -o '[0-9]*')" TERM
+
 if [ "$UID" = "0" ]; then
     # In Docker the server runs as root user but it will switch
     # into pkiuser (UID=17) that belongs to the root group (GID=0).
-    pki-server run
+    pki-server run &
+    PID=$!
+    wait $PID
 
 else
     # In OpenShift/Podman the server runs as a non-root user
     # (with a random UID) that belongs to the root group (GID=0).
     #
     # https://www.redhat.com/en/blog/jupyter-on-openshift-part-6-running-as-an-assigned-user-id
-    pki-server run --as-current-user
+    pki-server run --as-current-user &
+    PID=$!
+    wait $PID
 fi