Merge pull request #440 from balena-os/lmb/check-for-apparmor

Don't enable AppArmor if `apparmor_parser` is not present

DEVELOPMENT.md

@@ -175,20 +175,30 @@ suite while changing them to make use of the API.
 
 #### Vendoring
 
-Moby 22.06 will make use of the standard Go modules/vendoring system. Until
-then, we are using [vndr](https://github.com/LK4D4/vndr).
+More recent versions of Moby use of the standard Go modules/vendoring system.
+Until we update, we are using [vndr](https://github.com/LK4D4/vndr).
 
-Here's what you'd do to update a dependency:
+The safest way to vendor dependencies is this:
 
 1. Edit `vendor.conf`, making the desired dependency point to the desired
    version or commit hash.
 2. Run `make BIND_DIR=. shell` to enter into the "development environment".
    container.
-3. Run `vndr` for the desired dependency, e.g., `vndr
-   github.com/balena-os/librsync-go`.
+3. Run `./hack/vendor.sh`. This will take a while to run, and will re-download
+   all dependencies.
 4. Leave the development environment (`exit` or Ctrl+D). The code under
    `vendor/` will be updated.
 
+You probably want to stick with the steps above.
+
+However, if you are in a hurry, really know what you are doing, and don't mind
+some manual tweaking, you can ask for a single dependency to be vendored. To do
+this, simply replace step 3 above with a command like `vndr
+github.com/balena-os/librsync-go` (adjusting for the desired dependency). The
+danger is that you'll skip some smartness built into the `vendor.sh` script. For
+example, as I write this, calling `vndr` directly will *also* remove everything
+under `vendor/archive/tar/` (which is needed and must be manually restored).
+
 ## Update to a new upstream release
 
 We need to merge the upstream release into the engine repository and update our

vendor.conf

@@ -131,7 +131,7 @@ github.com/googleapis/gax-go                        bd5b16380fd03dc758d11cef74ba
 google.golang.org/genproto                          e50cd9704f63023d62cd06a1994b98227fc4d21a
 
 # containerd
-github.com/containerd/containerd                    e427a4fa7dd076978806aead28ad563cf10d126a https://github.com/balena-os/balena-containerd # 20.10.17-balena branch, equivalent to upstream's v1.6.6
+github.com/containerd/containerd                    2412f5439937b966cdd7fa4a83656371254bdc4f https://github.com/balena-os/balena-containerd # 20.10.17-balena branch, equivalent to upstream's v1.6.6
 github.com/containerd/fifo                          650e8a8a179d040123db61f016cb133143e7a581 # v1.0.0
 github.com/containerd/continuity                    092b2c8f580622aee465fd5d6aba1dc8fad58b56 # v0.2.2
 github.com/containerd/cgroups                       1df78138f1e1e6ee593db155c6b369466f577651 # v1.0.3