Remove use of waiter

Author: santiagolizardo

Makefile

@@ -50,7 +50,6 @@ build:
 
 .PHONY: tests
 tests: start validate
-	docker compose run --rm -e WAIT_HOSTS=$(DB_CONTAINER):3306 -e WAIT_TIMEOUT=60 --entrypoint /usr/local/bin/wait waiter
 	echo Importing SQL files: $(wildcard database/0*.sql)
 	cat tests/database.sql | docker container exec -i $(DB_CONTAINER) mysql -uroot -preconmuppet
 	cat database/0*.sql | sed "s/USE reconmap;/USE reconmap_test;/" | docker container exec -i $(DB_CONTAINER) mysql -uroot -preconmuppet reconmap_test

compose.yaml

@@ -1,11 +1,4 @@
 services:
-
-  waiter:
-    container_name: rmap-waiter
-    build:
-      context: ./
-      dockerfile: docker/Dockerfile.waiter
-
   redis:
     container_name: rmap-redis
     image: redis:7.4
@@ -30,9 +23,10 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: reconmuppet
     healthcheck:
-      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
-      timeout: 20s
-      retries: 10
+      test: "mysql -h 127.0.0.1 -u root --password=$$MYSQL_ROOT_PASSWORD mysql -e 'SELECT 1;'"
+      interval: 5s
+      timeout: 10s
+      retries: 3
 
   keycloak:
     image: quay.io/reconmap/keycloak-custom:latest
@@ -45,7 +39,7 @@ services:
       JAVA_OPTS_APPEND: ""
       KC_DB_VENDOR: MYSQL
       KC_DB: mysql
-      KC_DB_URL: 'jdbc:mysql://rmap-mysql/keycloak'
+      KC_DB_URL: "jdbc:mysql://rmap-mysql/keycloak"
       KC_DB_DATABASE: keycloak
       KC_DB_USERNAME: keycloaker
       KC_DB_PASSWORD: keycloaked
@@ -54,6 +48,11 @@ services:
       VAR_WEB_CLIENT_URL: "http://localhost:5500"
     ports:
       - "8080:8080"
+    healthcheck:
+      test: ["CMD-SHELL", "exec 3<>/dev/tcp/127.0.0.1/9000;echo -e 'GET /health/ready HTTP/1.1\r\nhost: http://localhost\r\nConnection: close\r\n\r\n' >&3;if [ $? -eq 0 ]; then echo 'Healthcheck Successful';exit 0;else echo 'Healthcheck Failed';exit 1;fi;"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
     depends_on:
       mysql:
         condition: service_healthy
@@ -88,6 +87,9 @@ services:
       REDIS_PORT: 6379
       REDIS_USER: default
       REDIS_PASSWORD: REconDIS
+    depends_on:
+      mysql:
+        condition: service_healthy
 
   agent:
     container_name: rmap-agent
@@ -103,4 +105,3 @@ services:
       REDIS_HOST: redis
       REDIS_PORT: 6379
       REDIS_PASSWORD: REconDIS
-