Over the past few days I’ve been looking at how Git can interact with Munki. Using Git with Munki is covered in the Munki Wiki. It describes how to set up a git repository on a server with which you have CLI access.
In my tests, I’ve been using a private repository on Bitbucket. I also started with an existing Munki repo, rather than setting up a new one.
Setting up git on an existing Munki Repo
Setting up the test Munki repo with Git was done as follows:
- An empty repo was set up on Bitbucket.org
- The existing
munki_repofolder was initialised for git using the commands:
cd /path/to/munki_repo; git init
pkgsfolder was set to be ignored, as I didn’t want the large pkg/dmg/app files to be uploaded to the repo. This was done by editing
/path/to/munki_repo/.gitignoreand simply adding the line
pkgsto the file.
- Then, sync the repo to the server:
$ git add .
$ git commit -m "Initial import"
$ git remote add origin firstname.lastname@example.org:myaccount/my_test_munki_repo.git
$ git push --set-upstream origin master
Version control is an essential tool in any Mac Administrator’s workflow. However, using Git with Munki has challenges due to the munki repository containing potentially very large packages, unsuitable for free cloud Git repositories such as Bitbucket, and challenging for paid private repositories on Github or elsewhere due to bandwidth issues. Even using your local organisation’s Git service could have bandwidth issues.
A solution such as Git Fat could help with these issues, as the large files are dealt with separately. Alistair Banks describes an example Git Fat setup here. Git-LFS is another solution that could help. I intend to test these out and report in a future post.
Configuring Munki-Do for Git
I have extended the functionality of Munki-Do so that it can now update Git repos when changes are made to
pkginfo files, and therefore
catalogs. In Munki-Do, Git is enabled by setting the path to the git command on the system hosting Munki-Do, in settings.py. In my case, I’m running Munki-Do in a Docker Container, and the path is as follows:
GIT_PATH = '/usr/bin/git'
Bitbucket doesn’t respond to
--author flags in
git commit commands, so Munki-Do has been recoded to set the author variables based on the current user using
git config user.name and
git config user.email commands.
Since the Bitbucket repository is a private one, to enable automated interaction with the Bitbucket server, an ssh key needs to be generated on Munki-Do’s host, and the public key imported to the Bitbucket repo. The process for doing this is described here.
My test Munki-Do host is a Docker Container, so I imported my SSH key from my host Mac into the Docker Container using commands in the
ADD id_rsa /root/.ssh/id_rsa
RUN touch /root/.ssh/known_hosts
RUN chown root: /root/.ssh/id_rsa && chmod 600 /root/.ssh/id_rsa
RUN ssh-keyscan bitbucket.org >> /root/.ssh/known_hosts
id_rsa must be first copied from
~/.ssh/ to the same folder as the
In my testing, sometimes the above
ssh-keyscan command is not successful during docker build, in which case your git commits will fail. Take notice of the output of the build to ensure success! You can run the command again in a bash shell in the container if it fails during build.