Add healthcheck to Wireguard

leona · Oct 30, 2023 · 74773ff · 74773ff
1 parent a7528da
commit 74773ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -62,6 +62,7 @@ jobs:
         run: |
           ssh root@${{ secrets.IP }} "mkdir -p /root/freeflix"
           rsync -vrm ./dist/* root@${{ secrets.IP }}:/root/freeflix/dist --delete
+          ssh root@${{ secrets.IP }} "docker pull nxie/wireguard"
           ssh root@${{ secrets.IP }} "cd /root/freeflix && docker-compose --profile serve down; exit 0"
           scp ./docker-compose.yml root@${{ secrets.IP }}:/root/freeflix/docker-compose.yml
           scp ./.env root@${{ secrets.IP }}:/root/freeflix/.env

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -85,8 +85,8 @@ services:
     volumes:
       - ./:/app
   client:
-    depends_on:
-      - wireguard
+    wireguard:
+      condition: service_healthy
     profiles: [serve]
     image: alpine:latest
     logging:
@@ -106,6 +106,11 @@ services:
     env_file: .env
     image: nxie/wireguard:latest
     container_name: wireguard
+    healthcheck:
+      test: bash -c "[ -f /tmp/wireguard.lock ]"
+      interval: 1s
+      timeout: 3s
+      retries: 10
     cap_add:
       - NET_ADMIN
     networks: