workflows with timeout

Author: MichalFrends1

.github/workflows/SearchObjects_build_and_test_on_main.yml

@@ -14,13 +14,23 @@ jobs:
     with:
       workdir: Frends.LDAP.SearchObjects
       prebuild_command: |
-        docker run -d -i --rm -p 10389:10389 dwimberger/ldap-ad-it
-        docker run -d -i --rm -p 20389:389 osixia/openldap:1.5.0 \
-          --env LDAP_ORGANISATION="Test Org" \
-          --env LDAP_DOMAIN="example.org" \
-          --env LDAP_ADMIN_PASSWORD="admin"
+        docker run -d -i --rm --name ldap1 -p 10389:10389 dwimberger/ldap-ad-it
+        docker run -d -i --rm --name ldap2 -p 20389:389 \
+          -e LDAP_ORGANISATION="Test Org" \
+          -e LDAP_DOMAIN="example.org" \
+          -e LDAP_ADMIN_PASSWORD="admin" \
+          osixia/openldap:1.5.0
 
-        echo "Sleeping to wait for osixia LDAP..."
-        sleep 20
+        echo "Waiting for osixia LDAP to be ready..."
+        for i in {1..30}; do
+        if docker logs ldap2 2>&1 | grep -q "slapd starting"; then
+            echo "osixia LDAP is ready."
+            break
+        fi
+        echo "Still waiting for osixia LDAP ($i)..."
+        sleep 1
+        done
+
+        echo "Prebuild finished."
     secrets:
       badge_service_api_key: ${{ secrets.BADGE_SERVICE_API_KEY }}

.github/workflows/SearchObjects_build_and_test_on_push.yml

@@ -14,14 +14,24 @@ jobs:
     with:
       workdir: Frends.LDAP.SearchObjects
       prebuild_command: |
-        docker run -d -i --rm -p 10389:10389 dwimberger/ldap-ad-it
-        docker run -d -i --rm -p 20389:389 osixia/openldap:1.5.0 \
-          --env LDAP_ORGANISATION="Test Org" \
-          --env LDAP_DOMAIN="example.org" \
-          --env LDAP_ADMIN_PASSWORD="admin"
+        docker run -d -i --rm --name ldap1 -p 10389:10389 dwimberger/ldap-ad-it
+        docker run -d -i --rm --name ldap2 -p 20389:389 \
+          -e LDAP_ORGANISATION="Test Org" \
+          -e LDAP_DOMAIN="example.org" \
+          -e LDAP_ADMIN_PASSWORD="admin" \
+          osixia/openldap:1.5.0
 
-        echo "Sleeping to wait for osixia LDAP..."
-        sleep 20
+        echo "Waiting for osixia LDAP to be ready..."
+        for i in {1..30}; do
+        if docker logs ldap2 2>&1 | grep -q "slapd starting"; then
+            echo "osixia LDAP is ready."
+            break
+        fi
+        echo "Still waiting for osixia LDAP ($i)..."
+        sleep 1
+        done
+
+        echo "Prebuild finished."
     secrets:
       badge_service_api_key: ${{ secrets.BADGE_SERVICE_API_KEY }}
       test_feed_api_key: ${{ secrets.TASKS_TEST_FEED_API_KEY }}

Frends.LDAP.SearchObjects/Frends.LDAP.SearchObjects.Tests/UnitTestAnonymousBind .cs

@@ -12,7 +12,7 @@ namespace Frends.LDAP.SearchObjects.Tests;
 public class UnitTestAnonymousBind
 {
     /*
-        Create a simple LDAP server to docker for anonymous bind testing.
+        Create a simple LDAP server to docker for anonymous bind testing
         docker run --rm -p 20389:389 -e LDAP_ORGANISATION="Test Org" -e LDAP_DOMAIN="example.org" -e LDAP_ADMIN_PASSWORD="admin" osixia/openldap:1.5.0
     */