Compare commits
No commits in common. "ba5d61c71e1435ad6b3a93797344a51d1fc82522" and "a4e45370879cc154126cb427749027df1707b58a" have entirely different histories.
ba5d61c71e
...
a4e4537087
@ -36,12 +36,8 @@ dockerCopyBuildContext()
|
|||||||
# Use rsync if available so re-installs only diff what changed; fall
|
# Use rsync if available so re-installs only diff what changed; fall
|
||||||
# back to cp -R for systems without rsync. Either way we exclude the
|
# back to cp -R for systems without rsync. Either way we exclude the
|
||||||
# files that have their own copy lifecycle.
|
# files that have their own copy lifecycle.
|
||||||
# --no-owner --no-group: don't carry the install template's ownership (the
|
|
||||||
# repo clone is owned by the human user, uid ~1000) onto the deployed
|
|
||||||
# container dir — the chown below sets the correct owner. Without this the
|
|
||||||
# rsync re-stamps the WebUI tree as uid 1000 every install.
|
|
||||||
if command -v rsync >/dev/null 2>&1; then
|
if command -v rsync >/dev/null 2>&1; then
|
||||||
sudo rsync -a --no-owner --no-group \
|
sudo rsync -a \
|
||||||
--exclude="docker-compose.yml" \
|
--exclude="docker-compose.yml" \
|
||||||
--exclude="docker-compose.${app_name}.yml" \
|
--exclude="docker-compose.${app_name}.yml" \
|
||||||
--exclude="${app_name}.config" \
|
--exclude="${app_name}.config" \
|
||||||
@ -56,11 +52,6 @@ dockerCopyBuildContext()
|
|||||||
sudo rm -f "$target_dir/${app_name}.config" "$target_dir/${app_name}.tools.json"
|
sudo rm -f "$target_dir/${app_name}.config" "$target_dir/${app_name}.tools.json"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Own the deployed tree as the mode's container owner (config-authoritative,
|
sudo chown -R "$docker_install_user:$docker_install_user" "$target_dir"
|
||||||
# never the stale/empty $docker_install_user global that let uid 1000 slip
|
|
||||||
# through before).
|
|
||||||
local owner
|
|
||||||
owner="$(dockerContainerOwner)"
|
|
||||||
runSystem chown -R "$owner:$owner" "$target_dir"
|
|
||||||
isSuccessful "Build context copied for $app_name."
|
isSuccessful "Build context copied for $app_name."
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user