From 3c2b32c215b95d1e4bd73f600730be9d4767fe2c Mon Sep 17 00:00:00 2001
From: Jamil <jamilbk@users.noreply.github.com>
Date: Wed, 17 Jan 2024 03:35:45 -0800
Subject: [PATCH] revert(devops): Revert healthcommands (#3280)

---
 docker-compose.yml                              | 7 +++----
 elixir/apps/web/lib/web/live/sites/new_token.ex | 2 +-
 scripts/gateway-docker-upgrade.sh               | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index fa5be3ade..352be3bc1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -147,7 +147,7 @@ services:
 
   gateway:
     healthcheck:
-      test: ["CMD-SHELL", "cat /proc/net/dev | grep tun-firezone"]
+      test: ["CMD-SHELL", "ip link | grep tun-firezone"]
     environment:
       FIREZONE_TOKEN: ".SFMyNTY.g2gDaANtAAAAJGM4OWJjYzhjLTkzOTItNGRhZS1hNDBkLTg4OGFlZjZkMjhlMG0AAAAkMjI3NDU2MGItZTk3Yi00NWU0LThiMzQtNjc5Yzc2MTdlOThkbQAAADhPMDJMN1VTMkozVklOT01QUjlKNklMODhRSVFQNlVPOEFRVk82VTVJUEwwVkpDMjJKR0gwPT09PW4GAF3gLBONAWIAAVGA.DCT0Qv80qzF5OQ6CccLKXPLgzC3Rzx5DqzDAh9mWAww"
       RUST_LOG: firezone_gateway=trace,wire=trace,connlib_gateway_shared=trace,firezone_tunnel=trace,connlib_shared=trace,warn
@@ -221,9 +221,8 @@ services:
         PACKAGE: firezone-relay
     image: us-east1-docker.pkg.dev/firezone-staging/firezone/relay:${VERSION:-main}
     healthcheck:
-      # Poor man's netstat -- Check for listening on 3478 (D96 in hex)
-      test: ["CMD-SHELL", "cat /proc/net/udp | grep D96"]
-      start_period: 3s
+      test: ["CMD-SHELL", "lsof -i UDP | grep firezone-relay"]
+      start_period: 10s
       interval: 30s
       retries: 5
       timeout: 5s
diff --git a/elixir/apps/web/lib/web/live/sites/new_token.ex b/elixir/apps/web/lib/web/live/sites/new_token.ex
index 1162b2b9b..2fdb1348c 100644
--- a/elixir/apps/web/lib/web/live/sites/new_token.ex
+++ b/elixir/apps/web/lib/web/live/sites/new_token.ex
@@ -166,7 +166,7 @@ defmodule Web.Sites.NewToken do
       "docker run -d",
       "--restart=unless-stopped",
       "--pull=always",
-      "--health-cmd=\"cat /proc/net/dev | grep tun-firezone\"",
+      "--health-cmd=\"ip link | grep tun-firezone\"",
       "--name=firezone-gateway",
       "--cap-add=NET_ADMIN",
       "--volume /var/lib/firezone",
diff --git a/scripts/gateway-docker-upgrade.sh b/scripts/gateway-docker-upgrade.sh
index e4a581f29..09a7a4e2e 100755
--- a/scripts/gateway-docker-upgrade.sh
+++ b/scripts/gateway-docker-upgrade.sh
@@ -30,7 +30,7 @@ do
         docker run -d \
           --restart=unless-stopped \
           --pull=always \
-          --health-cmd="cat /proc/net/dev | grep tun-firezone" \
+          --health-cmd="ip link | grep tun-firezone" \
           --name="$RUNNING_NAME" \
           --cap-add=NET_ADMIN \
           --volume /var/lib/firezone \