revert(devops): Revert healthcommands (#3280)

This commit is contained in:
Jamil
2024-01-17 03:35:45 -08:00
committed by GitHub
parent 3cb54e54d2
commit 3c2b32c215
3 changed files with 5 additions and 6 deletions

View File

@@ -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

View File

@@ -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",

View File

@@ -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 \