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

refactor: only extract the nginx.conf.sigil from the source code and not an app path

Browse Source 
The previous method was a bit more difficult for users to interact with as they needed to ensure the file was at a certain path in the built image. This change divorces the file from the built artifact, better aligning the nginx.conf.sigil handling with the rest of Dokku's monorepo support.

A side effect of this is now building proxy configurations does not require access to the built image.

Closes #5207
This commit is contained in:
Jose Diaz-Gonzalez
2022-11-23 19:30:45 -05:00
parent 05b85d0ff3
commit 17814d4847
8 changed files with 82 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/nginx-vhosts/core-post-deploy
View File

@@ -18,6 +18,9 @@ trigger-nginx-vhosts-core-post-deploy() {
if [[ "$HAS_NETWORK_CONFIG" == "true" ]]; then
plugn trigger domains-setup "$APP"
nginx_build_config "$APP"
if [[ -f "${DOKKU_LIB_ROOT}/data/nginx-vhosts/upcoming.nginx.conf.sigil" ]]; then
mv "${DOKKU_LIB_ROOT}/data/nginx-vhosts/upcoming.nginx.conf.sigil" "${DOKKU_LIB_ROOT}/data/nginx-vhosts/nginx.conf.sigil"
fi
fi
}