Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix non sudo enable community addon #4714

Merged
merged 11 commits into from
Nov 8, 2024
Merged

fix non sudo enable community addon #4714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
570b120
fix non sudo enable community addon
maci3jka Oct 22, 2024
59cdab2
unset fix
maci3jka Oct 23, 2024
07c343d
logic fix to not run when sudo
maci3jka Oct 23, 2024
e57c702
narrow safe directory
maci3jka Oct 23, 2024
522c444
safe directory only for enable community
maci3jka Oct 23, 2024
657d1d5
refactor non-sudo enable community addon
maci3jka Oct 25, 2024
072a204
hardcode gitconfig
maci3jka Nov 1, 2024
e66351f
hardcode gitconfig
maci3jka Nov 5, 2024
78de3ed
review fixes
maci3jka Nov 6, 2024
5bbbc2b
trivy fix
maci3jka Nov 7, 2024
985d81a
Revert "trivy fix"
maci3jka Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions microk8s-resources/default-args/git/.gitconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[safe]
directory = /snap/microk8s/current/addons/community/.git
directory = /snap/microk8s/current/addons/core/.git
2 changes: 2 additions & 0 deletions microk8s-resources/wrappers/git.wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ export GIT_EXEC_PATH="$SNAP/usr/lib/git-core"
export GIT_TEMPLATE_DIR="$SNAP/usr/share/git-core/templates"
export GIT_CONFIG_NOSYSTEM=1

HOME="${SNAP_DATA}/args/git"

"$SNAP/usr/bin/git" "${@}"
4 changes: 4 additions & 0 deletions snap/hooks/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,4 +148,8 @@ then
touch ${SNAP_DATA}/var/lock/low-memory-guard.lock
fi

# copy git config
mkdir -p ${SNAP_DATA}/args/git
cp ${SNAP}/default-args/git/.gitconfig ${SNAP_DATA}/args/git/.gitconfig

touch "${SNAP_DATA}/var/lock/installed.lock"
Loading