Use docker-compose for e2e test

.dockerignore

@@ -1,3 +1 @@
-.git
-*.md
-LICENSE
+!build

.github/workflows/ci.yaml

@@ -48,25 +48,15 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-tinygo-
 
-      - name: Run tests
+      - name: Run unit tests
         run: make test
 
       - name: Build WASM filter
         run: make build
 
-      - name: "Install func-e"
-        shell: bash
-        run: curl https://func-e.io/install.sh | bash -s -- -b /usr/local/bin
-
-      - name: "Spin up server and envoy"
-        shell: bash
-        run: |
-          func-e run -c e2e/envoy-config.yaml --log-level info --component-log-level wasm:debug &
-
-      - name: "Run tests"
-        shell: bash
-        run: |
-          ./e2e/tests.sh
+      - name: Run e2e tests
+        working-directory: e2e
+        run: docker-compose up --abort-on-container-exit
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2

Makefile

@@ -16,15 +16,3 @@ build:
 
 test:
 	go test -tags="proxytest" ./...
-
-server-test-build:
-	docker build --progress=plain -t $(IMAGE_NAME) -f Dockerfile.server-test .
-
-server-test-wasm-dump: server-test-build
-	@docker rm -f $(CONTAINER_NAME) || true
-	@docker create -ti --name $(CONTAINER_NAME) $(IMAGE_NAME) bash
-	docker cp $(CONTAINER_NAME):/usr/bin/wasm-filter/build ./
-	@docker rm -f $(CONTAINER_NAME)
-
-server-test-run: server-test-build
-	docker run -p 8001:8001 $(IMAGE_NAME)

e2e/docker-compose.yml

@@ -0,0 +1,25 @@
+services:
+  envoy:
+    image: envoyproxy/envoy:v1.22-latest
+    command:
+      - -c
+      - /conf/envoy-config.yaml
+      - --log-level
+      - info
+      - --component-log-level
+      - wasm:debug
+    volumes:
+      - ../build:/build
+      - .:/conf
+    ports:
+      - 8001:8001
+  tests:
+    depends_on:
+      - envoy
+    image: curlimages/curl
+    entrypoint: sh
+    command:
+      - /conf/tests.sh
+      - envoy
+    volumes:
+      - .:/conf

e2e/tests.sh

@@ -5,9 +5,10 @@
 step=1
 total_steps=3
 max_retries=10 #seconds for the server reachability timeout
-health_url="http://localhost:8001"
-unfiltered_url="http://localhost:8001/home"
-filtered_url="http://localhost:8001/admin"
+host=${1:-localhost}
+health_url="http://${host}:8001"
+unfiltered_url="http://${host}:8001/home"
+filtered_url="http://${host}:8001/admin"
 
 # Testing if the server is up
 echo "[$step/$total_steps] Testing application reachability"