Skip to content

Commit 36c49f0

Browse files
committed
[requested-changes] Added ping in celery container
1 parent 64d8316 commit 36c49f0

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

images/common/init_command.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ elif [ "$MODULE_NAME" = 'wireguard' ]; then
5151
exit
5252
fi
5353
wait_nginx_services
54-
sudo -u openwisp -E bash -c "source utils.sh; wireguard_setup"
54+
wireguard_setup
5555

5656
elif [ "$MODULE_NAME" = 'wireguard_updater' ]; then
5757
start_uwsgi

images/openwisp_celery/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ COPY --chown=openwisp:root ./openwisp_dashboard/module_settings.py \
1414

1515
USER root:root
1616
RUN apt install --yes --no-install-recommends \
17-
iproute2 iptables sudo
17+
iproute2 iptables sudo iputils-ping
1818
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
1919

2020
CMD ["bash", "init_command.sh"]

images/openwisp_wireguard/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ COPY --chown=openwisp:root ./openwisp_wireguard/update_wireguard.sh \
2020
./common/utils.sh \
2121
./common/services.py /opt/openwisp/
2222

23-
CMD ["bash", "init_command.sh"]
23+
USER openwisp:root
24+
ENTRYPOINT ["bash", "init_command.sh"]
2425

2526
EXPOSE 51820
2627

images/openwisp_wireguard/update_wireguard.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ watch_configuration_change() {
121121
_REDIS_CMD="$_REDIS_CMD -p $REDIS_PORT"
122122
fi
123123
if [[ "$REDIS_PASS" ]]; then
124-
_REDIS_CMD="$_REDIS_CMD -a $REDIS_PASS"
124+
_REDIS_CMD="$_REDIS_CMD -a $REDIS_PASS --no-auth-warning"
125125
fi
126126
while true; do
127127
if [ -f "$_TIMESTAMP_FILE" ]; then

0 commit comments

Comments
 (0)