hardcode gitconfig

canonical · Nov 5, 2024 · e66351f · e66351f
1 parent 072a204
commit e66351f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/build-scripts/addons/repositories.sh b/build-scripts/addons/repositories.sh
@@ -31,9 +31,3 @@ done
 echo "${ADDONS_REPOS_ENABLED}" > addons/.auto-add
 
 cp -r "addons" "${INSTALL}/addons"
-
-cat > ${INSTALL}/gitconfig << EOF
-[safe]
-        directory = /snap/microk8s/current/addons/community/.git
-
-EOF
diff --git a/microk8s-resources/gitconfig b/microk8s-resources/gitconfig
@@ -0,0 +1,3 @@
+[safe]
+        directory = /snap/microk8s/current/addons/community/.git
+        directory = /snap/microk8s/current/addons/core/.git
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -250,6 +250,7 @@ parts:
       cp client.config.template "${SNAPCRAFT_PART_INSTALL}/client.config.template"
       cp kubelet.config.template "${SNAPCRAFT_PART_INSTALL}/kubelet.config.template"
       cp client-x509.config.template "${SNAPCRAFT_PART_INSTALL}/client-x509.config.template"
+      cp gitconfig "${SNAPCRAFT_PART_INSTALL}/gitconfig"
 
       cp -r wrappers/* "${SNAPCRAFT_PART_INSTALL}/"
       cp -r actions/ "${SNAPCRAFT_PART_INSTALL}/actions"