Revert "Add healthcheck for shibboleth-idp in idp-fixture (elastic#10…

…0369)" This reverts commit 003912b.
dakrone · Oct 6, 2023 · 0770e3d · 0770e3d
1 parent 87b1815
commit 0770e3d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 24 deletions.
diff --git a/x-pack/test/idp-fixture/build.gradle b/x-pack/test/idp-fixture/build.gradle
@@ -6,7 +6,6 @@ apply plugin: 'elasticsearch.test.fixtures'
 
 dockerCompose {
   composeAdditionalArgs = ['--compatibility']
-  upAdditionalArgs = ["--wait"]
 }
 
 tasks.named("preProcessFixture").configure {

diff --git a/x-pack/test/idp-fixture/docker-compose.yml b/x-pack/test/idp-fixture/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: '3.7'
 services:
   openldap:
     command: --copy-service --loglevel debug
@@ -37,12 +37,6 @@ services:
     links:
       - openldap:openldap
     restart: always #ensure ephemeral port mappings are properly updated
-    healthcheck:
-      test: curl -f -s --http0.9 http://localhost:4443 --connect-timeout 10 --max-time 10 --output - > /dev/null
-      interval: 5s
-      timeout: 20s
-      retries: 60
-      start_period: 10s
 
   oidc-provider:
     build:

diff --git a/x-pack/test/idp-fixture/idp/bin/run-jetty.sh b/x-pack/test/idp-fixture/idp/bin/run-jetty.sh
@@ -10,19 +10,4 @@ fi
 export JETTY_ARGS="jetty.sslContext.keyStorePassword=$JETTY_BROWSER_SSL_KEYSTORE_PASSWORD jetty.backchannel.sslContext.keyStorePassword=$JETTY_BACKCHANNEL_SSL_KEYSTORE_PASSWORD"
 sed -i "s/^-Xmx.*$/-Xmx$JETTY_MAX_HEAP/g" /opt/shib-jetty-base/start.ini
 
-# For some reason, this container always immediately (in less than 1 second) exits with code 0 when starting for the first time
-# Even with a health check, docker-compose will immediately report the container as unhealthy when using --wait instead of waiting for it to become healthy
-# So, let's just start it a second time if it exits quickly
-set +e
-start_time=$(date +%s)
-/opt/jetty-home/bin/jetty.sh run
-exit_code=$?
-end_time=$(date +%s)
-
-duration=$((end_time - start_time))
-if [ $duration -lt 5 ]; then
-  /opt/jetty-home/bin/jetty.sh run
-  exit_code=$?
-fi
-
-exit $exit_code
+exec /opt/jetty-home/bin/jetty.sh run