🗃️ Committing everything that changed 🗃️

Jenkinsfile
rootfs/usr/local/bin/entrypoint.sh
rootfs/usr/local/etc/docker/functions/

Jenkinsfile

@@ -0,0 +1,71 @@
+pipeline {
+    agent {
+        label 'arm64 || amd64'
+    }
+    
+    options {
+        buildDiscarder(logRotator(numToKeepStr: '10'))
+        timeout(time: 60, unit: 'MINUTES')
+        timestamps()
+    }
+    
+    environment {
+        DOCKER_REGISTRY = 'docker.io'
+        IMAGE_NAME = 'casjaysdevdocker/tor'
+        DOCKER_BUILDKIT = '1'
+    }
+    
+    stages {
+        stage('Checkout') {
+            steps {
+                checkout scm
+            }
+        }
+        
+        stage('Build Multi-Arch Image') {
+            steps {
+                script {
+                    def buildArgs = ""
+                    if (fileExists('.env.scripts')) {
+                        buildArgs = "--build-arg-file .env.scripts"
+                    }
+                    
+                    sh """
+                        docker buildx create --use --name mybuilder || true
+                        docker buildx build \\
+                            --platform linux/amd64,linux/arm64 \\
+                            --tag ${DOCKER_REGISTRY}/${IMAGE_NAME}:latest \\
+                            --tag ${DOCKER_REGISTRY}/${IMAGE_NAME}:\${BUILD_NUMBER} \\
+                            ${buildArgs} \\
+                            --push .
+                    """
+                }
+            }
+        }
+        
+        stage('Test') {
+            steps {
+                script {
+                    sh """
+                        docker run --rm --platform linux/\$(uname -m) \\
+                            ${DOCKER_REGISTRY}/${IMAGE_NAME}:latest \\
+                            /bin/sh -c 'echo "Container test passed"'
+                    """
+                }
+            }
+        }
+    }
+    
+    post {
+        always {
+            sh 'docker buildx rm mybuilder || true'
+            cleanWs()
+        }
+        success {
+            echo 'Build completed successfully!'
+        }
+        failure {
+            echo 'Build failed!'
+        }
+    }
+}

rootfs/usr/local/bin/entrypoint.sh

@@ -88,7 +88,7 @@ SERVER_PORTS="" # specifiy other ports
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Healthcheck variables
 HEALTH_ENABLED="yes"                                                # enable healthcheck [yes/no]
-SERVICES_LIST="tini,tor-server,tor-relay,tor-bridge,privoxy,unbound,php" # comma seperated list of processes for the healthcheck
+SERVICES_LIST="tini,tor-bridge,tor-relay,tor-server,unbound,privoxy,zz-nginx"
 HEALTH_ENDPOINTS=""                                                 # url endpoints: [http://localhost/health,http://localhost/test]
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Update path var
@@ -360,8 +360,14 @@ if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
   __setup_mta
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# if no pid assume container restart
+# if no pid assume container restart - clean stale files on restart
-[ -f "$ENTRYPOINT_PID_FILE" ] && [ -f "/run/__start_init_scripts.pid" ] || START_SERVICES="yes"
+if [ ! -f "$ENTRYPOINT_PID_FILE" ]; then 
+  START_SERVICES="yes"
+  # Clean stale pid files from previous container runs
+  rm -f /run/__start_init_scripts.pid /run/init.d/*.pid /run/*.pid
+elif [ ! -f "/run/__start_init_scripts.pid" ]; then
+  START_SERVICES="yes" 
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 [ "$ENTRYPOINT_MESSAGE" = "yes" ] && __printf_space "40" "Container ip address is:" "$CONTAINER_IP4_ADDRESS"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -