From b2db161a8a53fe71644295c5cee967a49cb1d909 Mon Sep 17 00:00:00 2001
From: Eguzki Astiz Lezaun <eastizle@redhat.com>
Date: Thu, 17 Oct 2024 17:16:29 +0200
Subject: [PATCH] fixup! fixup! fixup! fixup! fixup! fixup! remote_address:
 step 4 e2e integration test

---
 .github/workflows/e2e.yaml             |  8 +++-----
 e2e/remote-address/Makefile            |  5 ++---
 e2e/remote-address/docker-compose.yaml | 13 +++++++++++++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 31ab99a..8c5a5b1 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -27,11 +27,9 @@ jobs:
       with:
         command: build
         args: --target wasm32-unknown-unknown
-    - name: Run docker-compose
-      uses: hoverkraft-tech/compose-action@v2.0.1
-      with:
-        compose-file: "./e2e/remote-address/docker-compose.yaml"
-        up-flags: "--detach"
+    - name: Run docker compose
+      run: |
+        docker compose -f ./e2e/remote-address/docker-compose.yaml run start_services
     - name: Execute tests in the running services
       run: |
         make -f ./e2e/remote-address/Makefile test
diff --git a/e2e/remote-address/Makefile b/e2e/remote-address/Makefile
index 592ddc6..8b1c0fe 100644
--- a/e2e/remote-address/Makefile
+++ b/e2e/remote-address/Makefile
@@ -6,11 +6,10 @@ WORKDIR := $(patsubst %/,%,$(dir $(MKFILE_PATH)))
 DOCKER ?= $(shell which docker 2> /dev/null || echo "docker")
 
 run:
-	$(DOCKER) compose -f docker-compose.yaml up --detach
+	$(DOCKER) compose -f docker-compose.yaml run start_services
 
 test:
-	# curl --silent --output /dev/null --fail --resolve test.example.com:18000:127.0.0.1 -H "X-Forwarded-For: 40.0.0.1" "http://test.example.com:18000"
-	curl --fail --resolve test.example.com:18000:127.0.0.1 -H "X-Forwarded-For: 40.0.0.1" "http://test.example.com:18000"
+	curl --silent --output /dev/null --fail --resolve test.example.com:18000:127.0.0.1 -H "X-Forwarded-For: 40.0.0.1" "http://test.example.com:18000"
 	curl --silent --output /dev/null --fail --resolve test.example.com:18000:127.0.0.1 -H "X-Forwarded-For: 50.0.0.1" "http://test.example.com:18000"
 	$(eval TMP := $(shell mktemp -d))
 	curl --silent --output $(TMP)/counters.json --fail "http://127.0.0.1:18080/counters/ratelimit-source"
diff --git a/e2e/remote-address/docker-compose.yaml b/e2e/remote-address/docker-compose.yaml
index cee54f7..bcecea7 100644
--- a/e2e/remote-address/docker-compose.yaml
+++ b/e2e/remote-address/docker-compose.yaml
@@ -41,3 +41,16 @@ services:
       PORT: 3000
     expose:
     - "3000"
+  start_services:
+    image: alpine
+    depends_on:
+    - envoy
+    command: >
+      /bin/sh -c "
+      while ! nc -z envoy 80;
+      do
+      echo sleeping;
+      sleep 1;
+      done;
+      echo Connected!
+      "