diff --git a/src/linux/Dockerfile-centos b/src/linux/Dockerfile-centos index 10e4f586..1a799c88 100644 --- a/src/linux/Dockerfile-centos +++ b/src/linux/Dockerfile-centos @@ -71,7 +71,7 @@ RUN cp /usr/share/bunkerweb/helpers/bwcli /usr/bin/ && \ find /usr/share/bunkerweb -path /usr/share/bunkerweb/deps -prune -o -type f -exec chmod 0740 {} \; && \ find /usr/share/bunkerweb -path /usr/share/bunkerweb/deps -prune -o -type d -exec chmod 0750 {} \; && \ chmod -R 770 /var/cache/bunkerweb/ /var/lib/bunkerweb/ /etc/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ /var/log/bunkerweb/ && \ - chmod 750 /usr/share/bunkerweb/gen/main.py /usr/share/bunkerweb/scheduler/main.py /usr/share/bunkerweb/cli/main.py /usr/share/bunkerweb/helpers/*.sh /usr/share/bunkerweb/ui/main.py /var/www && \ + chmod 750 /usr/share/bunkerweb/gen/*.py /usr/share/bunkerweb/scheduler/*.py /usr/share/bunkerweb/cli/*.py /usr/share/bunkerweb/ui/*.py /usr/share/bunkerweb/ui/src/*.py /usr/share/bunkerweb/deps/python/bin/* /usr/share/bunkerweb/helpers/*.sh /var/www/ && \ find /usr/share/bunkerweb/core/*/jobs/* -type f -exec chmod 750 {} \; && \ chmod 755 /usr/share/bunkerweb diff --git a/src/linux/Dockerfile-debian b/src/linux/Dockerfile-debian index efe3c58d..82a5ff04 100644 --- a/src/linux/Dockerfile-debian +++ b/src/linux/Dockerfile-debian @@ -76,7 +76,7 @@ RUN cp /usr/share/bunkerweb/helpers/bwcli /usr/bin/ && \ find /usr/share/bunkerweb -path /usr/share/bunkerweb/deps -prune -o -type f -exec chmod 0740 {} \; && \ find /usr/share/bunkerweb -path /usr/share/bunkerweb/deps -prune -o -type d -exec chmod 0750 {} \; && \ chmod -R 770 /var/cache/bunkerweb/ /var/lib/bunkerweb/ /etc/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ /var/log/bunkerweb/ && \ - chmod 750 /usr/share/bunkerweb/gen/main.py /usr/share/bunkerweb/scheduler/main.py /usr/share/bunkerweb/cli/main.py /usr/share/bunkerweb/helpers/*.sh /usr/share/bunkerweb/ui/main.py /var/www/ && \ + chmod 750 /usr/share/bunkerweb/gen/*.py /usr/share/bunkerweb/scheduler/*.py /usr/share/bunkerweb/cli/*.py /usr/share/bunkerweb/ui/*.py /usr/share/bunkerweb/ui/src/*.py /usr/share/bunkerweb/deps/python/bin/* /usr/share/bunkerweb/helpers/*.sh /var/www/ && \ find /usr/share/bunkerweb/core/*/jobs/* -type f -exec chmod 750 {} \; && \ chmod 755 /usr/share/bunkerweb diff --git a/src/linux/Dockerfile-fedora b/src/linux/Dockerfile-fedora index 2b89be12..4132b5e5 100644 --- a/src/linux/Dockerfile-fedora +++ b/src/linux/Dockerfile-fedora @@ -72,7 +72,7 @@ RUN cp /usr/share/bunkerweb/helpers/bwcli /usr/bin/ && \ find /usr/share/bunkerweb -path /usr/share/bunkerweb/deps -prune -o -type f -exec chmod 0740 {} \; && \ find /usr/share/bunkerweb -path /usr/share/bunkerweb/deps -prune -o -type d -exec chmod 0750 {} \; && \ chmod -R 770 /var/cache/bunkerweb/ /var/lib/bunkerweb/ /etc/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ /var/log/bunkerweb/ && \ - chmod 750 /usr/share/bunkerweb/gen/main.py /usr/share/bunkerweb/scheduler/main.py /usr/share/bunkerweb/cli/main.py /usr/share/bunkerweb/helpers/*.sh /usr/share/bunkerweb/ui/main.py /var/www/ && \ + chmod 750 /usr/share/bunkerweb/gen/*.py /usr/share/bunkerweb/scheduler/*.py /usr/share/bunkerweb/cli/*.py /usr/share/bunkerweb/ui/*.py /usr/share/bunkerweb/ui/src/*.py /usr/share/bunkerweb/deps/python/bin/* /usr/share/bunkerweb/helpers/*.sh /var/www/ && \ find /usr/share/bunkerweb/core/*/jobs/* -type f -exec chmod 750 {} \; && \ chmod 755 /usr/share/bunkerweb diff --git a/src/linux/Dockerfile-rhel b/src/linux/Dockerfile-rhel index ca3885cd..2c8da357 100644 --- a/src/linux/Dockerfile-rhel +++ b/src/linux/Dockerfile-rhel @@ -86,7 +86,7 @@ RUN cp /usr/share/bunkerweb/helpers/bwcli /usr/bin/ && \ find /usr/share/bunkerweb -path /usr/share/bunkerweb/deps -prune -o -type f -exec chmod 0740 {} \; && \ find /usr/share/bunkerweb -path /usr/share/bunkerweb/deps -prune -o -type d -exec chmod 0750 {} \; && \ chmod -R 770 /var/cache/bunkerweb/ /var/lib/bunkerweb/ /etc/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ /var/log/bunkerweb/ && \ - chmod 750 /usr/share/bunkerweb/gen/main.py /usr/share/bunkerweb/scheduler/main.py /usr/share/bunkerweb/cli/main.py /usr/share/bunkerweb/helpers/*.sh /usr/share/bunkerweb/ui/main.py /var/www/ && \ + chmod 750 /usr/share/bunkerweb/gen/*.py /usr/share/bunkerweb/scheduler/*.py /usr/share/bunkerweb/cli/*.py /usr/share/bunkerweb/ui/*.py /usr/share/bunkerweb/ui/src/*.py /usr/share/bunkerweb/deps/python/bin/* /usr/share/bunkerweb/helpers/*.sh /var/www/ && \ find /usr/share/bunkerweb/core/*/jobs/* -type f -exec chmod 750 {} \; && \ chmod 755 /usr/share/bunkerweb diff --git a/src/linux/Dockerfile-ubuntu b/src/linux/Dockerfile-ubuntu index 4dca1700..6d75bfc4 100644 --- a/src/linux/Dockerfile-ubuntu +++ b/src/linux/Dockerfile-ubuntu @@ -76,7 +76,7 @@ RUN cp /usr/share/bunkerweb/helpers/bwcli /usr/bin/ && \ find /usr/share/bunkerweb -path /usr/share/bunkerweb/deps -prune -o -type f -exec chmod 0740 {} \; && \ find /usr/share/bunkerweb -path /usr/share/bunkerweb/deps -prune -o -type d -exec chmod 0750 {} \; && \ chmod -R 770 /var/cache/bunkerweb/ /var/lib/bunkerweb/ /etc/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ /var/log/bunkerweb/ && \ - chmod 750 /usr/share/bunkerweb/gen/main.py /usr/share/bunkerweb/scheduler/main.py /usr/share/bunkerweb/cli/main.py /usr/share/bunkerweb/helpers/*.sh /usr/share/bunkerweb/ui/main.py /var/www/ && \ + chmod 750 /usr/share/bunkerweb/gen/*.py /usr/share/bunkerweb/scheduler/*.py /usr/share/bunkerweb/cli/*.py /usr/share/bunkerweb/ui/*.py /usr/share/bunkerweb/ui/src/*.py /usr/share/bunkerweb/deps/python/bin/* /usr/share/bunkerweb/helpers/*.sh /var/www/ && \ find /usr/share/bunkerweb/core/*/jobs/* -type f -exec chmod 750 {} \; && \ chmod 755 /usr/share/bunkerweb diff --git a/tests/ui/tests.sh b/tests/ui/tests.sh index 174682d2..bc9d453b 100755 --- a/tests/ui/tests.sh +++ b/tests/ui/tests.sh @@ -36,7 +36,7 @@ if [ "$integration" = "docker" ] ; then fi else sudo systemctl stop bunkerweb bunkerweb-ui - sudo sed -i "/python3 -m gunicorn/c\ export MAKEFLAGS=\"-j\$(nproc)\"\n python3 -m pip install --no-cache-dir --require-hashes -r /usr/share/bunkerweb/deps/requirements.txt\n python3 -m flask --app main:app run --host=127.0.0.1 --port=7000 &\n echo \$? > /var/run/bunkerweb/ui.pid" /usr/share/bunkerweb/scripts/bunkerweb-ui.sh + sudo sed -i "/python3 -m gunicorn/c\ python3 -m gunicorn --config /usr/share/bunkerweb/ui/gunicorn.conf.py --user nginx --group nginx --bind \"127.0.0.1:7000\" --log-level debug &" /usr/share/bunkerweb/scripts/bunkerweb-ui.sh sudo mkdir /var/www/html/app1.example.com sudo touch /var/www/html/app1.example.com/index.html export TEST_TYPE="linux"