[requested-changes] Added ping in celery container

openwisp · Jun 21, 2022 · 43e389e · 43e389e
1 parent 64d8316
commit 43e389e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/images/common/init_command.sh b/images/common/init_command.sh
@@ -51,7 +51,7 @@ elif [ "$MODULE_NAME" = 'wireguard' ]; then
 		exit
 	fi
 	wait_nginx_services
-	sudo -u openwisp -E bash -c "source utils.sh; wireguard_setup"
+	wireguard_setup
 
 elif [ "$MODULE_NAME" = 'wireguard_updater' ]; then
 	start_uwsgi

diff --git a/images/openwisp_celery/Dockerfile b/images/openwisp_celery/Dockerfile
@@ -14,7 +14,7 @@ COPY --chown=openwisp:root ./openwisp_dashboard/module_settings.py \
 
 USER root:root
 RUN apt install --yes --no-install-recommends \
-        iproute2 iptables sudo
+        iproute2 iptables sudo iputils-ping
 RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 
 CMD ["bash", "init_command.sh"]

diff --git a/images/openwisp_wireguard/Dockerfile b/images/openwisp_wireguard/Dockerfile
@@ -20,7 +20,8 @@ COPY --chown=openwisp:root ./openwisp_wireguard/update_wireguard.sh \
     ./common/utils.sh \
     ./common/services.py /opt/openwisp/
 
-CMD ["bash", "init_command.sh"]
+USER openwisp:root
+ENTRYPOINT ["bash", "init_command.sh"]
 
 EXPOSE 51820
 

diff --git a/images/openwisp_wireguard/update_wireguard.sh b/images/openwisp_wireguard/update_wireguard.sh
@@ -121,7 +121,7 @@ watch_configuration_change() {
 		_REDIS_CMD="$_REDIS_CMD -p $REDIS_PORT"
 	fi
 	if [[ "$REDIS_PASS" ]]; then
-		_REDIS_CMD="$_REDIS_CMD -a $REDIS_PASS"
+		_REDIS_CMD="$_REDIS_CMD -a $REDIS_PASS --no-auth-warning"
 	fi
 	while true; do
 		if [ -f "$_TIMESTAMP_FILE" ]; then

diff --git a/tests/runtests.py b/tests/runtests.py
@@ -1,4 +1,5 @@
 import os
+import re
 import subprocess
 import time
 import unittest
@@ -449,6 +450,9 @@ def test_containers_down(self):
             cwd=self.root_location,
         )
         output, error = map(str, cmd.communicate())
+        # Remove wireguard container from output because it exits when it fails
+        # to download configuration from the dashboard
+        output = re.sub('docker-openwisp_wireguard_1(.*)Exit(.*)\\n', '', output)
         if 'Exit' in output:
             self.fail(
                 f'One of the containers are down!\nOutput:\n{output}\nError:\n{error}'