github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #5604 from dokku/faster-nginx-rebuild

Browse Source 
Trigger nginx proxy rebuild early to avoid downtime if deploying large numbers of processes
This commit is contained in:
josegonzalez
2023-01-23 16:13:31 -05:00
committed by GitHub
parent f4d5e352cc 9d9b880f59
commit a2baf37cd9
7 changed files with 64 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/unit/nginx-vhosts_11.bats
View File

@@ -178,7 +178,7 @@ teardown() {
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Overriding default nginx.conf with detected nginx.conf.sigil"
assert_output_contains "Overriding default nginx.conf with detected nginx.conf.sigil" 2
mv "$CUSTOM_TMP/nginx.conf.sigil" "$CUSTOM_TMP/nginx.conf.sigil-2"
@@ -207,7 +207,7 @@ teardown() {
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Overriding default nginx.conf with detected nginx.conf.sigil"
assert_output_contains "Overriding default nginx.conf with detected nginx.conf.sigil" 2
popd
rm -rf "$TMP"

6
tests/unit/nginx-vhosts_12.bats
View File

@@ -56,7 +56,7 @@ teardown() {
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Overriding default nginx.conf with detected nginx.conf.sigil"
assert_output_contains "Overriding default nginx.conf with detected nginx.conf.sigil" 2
run /bin/bash -c "dokku nginx:set --global nginx-conf-sigil-path dokku/nginx.conf.sigil"
echo "output: $output"
@@ -103,7 +103,7 @@ teardown() {
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Overriding default nginx.conf with detected nginx.conf.sigil"
assert_output_contains "Overriding default nginx.conf with detected nginx.conf.sigil" 2
run /bin/bash -c "dokku nginx:set --global nginx-conf-sigil-path"
echo "output: $output"
@@ -125,7 +125,7 @@ teardown() {
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Overriding default nginx.conf with detected nginx.conf.sigil"
assert_output_contains "Overriding default nginx.conf with detected nginx.conf.sigil" 2
run /bin/bash -c "docker image rm dokku-test/$TEST_APP:latest dokku-test/$TEST_APP:v2"
echo "output: $output"

4
tests/unit/nginx-vhosts_6.bats
View File

@@ -30,7 +30,7 @@ teardown() {
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Enabling HSTS"
assert_output_contains "Enabling HSTS" 2
run /bin/bash -c "test -f $HSTS_CONF"
echo "output: $output"
@@ -113,7 +113,7 @@ teardown() {
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Enabling HSTS"
assert_output_contains "Enabling HSTS" 2
# disable hsts globally
run /bin/bash -c "dokku nginx:set --global hsts false"