test: remove backwards compatibility code for older Docker images (#4993)

Closes #4951
This commit is contained in:
Reactor Scram
2024-05-15 12:08:30 -05:00
committed by GitHub
parent f48bab040a
commit 9c143bced3
2 changed files with 2 additions and 7 deletions

View File

@@ -19,10 +19,7 @@ sleep 1
docker network connect firezone_app firezone-client-1 --ip 172.28.0.200 # Reconnect client with a different IP
# Send SIGHUP, triggering `reconnect` internally
# The second command is needed for backwards compatibility with older Docker images
sudo kill -s HUP "$(ps -C firezone-headless-client -o pid=)" ||
sudo kill -s HUP "$(ps -C firezone-linux-client -o pid=)" ||
exit 1
sudo kill -s HUP "$(ps -C firezone-headless-client -o pid=)"
wait $DOWNLOAD_PID || {
echo "Download process failed"

View File

@@ -16,9 +16,7 @@ debug_exit() {
}
# Copy the Linux Client out of its container
docker compose cp client:/bin/"$BINARY_NAME" "$BINARY_NAME" ||
docker compose cp client:/bin/firezone-linux-client "$BINARY_NAME" ||
exit 1
docker compose cp client:/bin/"$BINARY_NAME" "$BINARY_NAME"
chmod u+x "$BINARY_NAME"
sudo chown root:root "$BINARY_NAME"
sudo mv "$BINARY_NAME" "/usr/bin/$BINARY_NAME"