Merge ~merlijn-sebrechts/+git/snap:master into ~docker/+git/snap:master

[Merlijn Sebrechts]

Update metadata to explain where to find config files

[Ian Johnson (anonymouse67)]

lgtm, also needs Tianon's approval however

review: Approve

[Tianon Gravi (tianon)]

TIL (again?) launchpad has Merge Requests :D

LGTM, thanks :)

review: Approve

[Tianon Gravi (tianon)]

... I have to admit, however, that my experience with launchpad is limited enough that I'm not certain how to properly merge this -- do I need to manually pull the changes via CLI and push them, or is there a "first-order" way to merge this directly in launchpad?

(I've searched, and all the docs I can find keep talking about bzr but it appears that "manual" is the correct method?)

[Merlijn Sebrechts (merlijn-sebrechts)]

Launchpad never fails to confuse me, I greatly prefer GitHub and GitLab over it..

It seems like there isn't actually a way to merge this using the GUI. I think the easiest way to merge my changes is to `git pull https://git.launchpad.net/~merlijn-sebrechts/+git/snap`, though this leaves the possibility that I ninja-push a commit between the review approval and when you pull the code, so that isn't as secure as I would like it.

[Ian Johnson (anonymouse67)]

Tianon, if you are an admin with write access, there should be a thing on the top of the MP to set the status to "approved" which then should merge it iirc, I don't have such powers for this anymore however

[Tianon Gravi (tianon)]

I've done one better and merged this to https://github.com/docker-snap/docker-snap, which is now the canonical (heh) source of the snap.

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 5f64c45..b49d6f4 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,7 +1,16 @@
 name: docker
+title: Docker
 version: '19.03.11'
-summary: Docker Linux container runtime
-description: Docker complements kernel namespacing with a high-level API which operates at the process level. It runs unix processes with strong guarantees of isolation and repeatability across servers.
+summary: Docker container runtime
+description: |
+  Build and run container images with Docker.
+
+  * This build can only access files in the home directory. So Dockerfiles and all other files used in commands like `docker build`, `docker save` and `docker load` need to be in $HOME.
+  * You can change the configuration of this build by modifying the files in `/var/snap/docker/current/`.
+
+  This snap is built by Canonical based on source code published by Docker, Inc. It is not endorsed or published by Docker, Inc.
+
+  Docker and the Docker logo are trademarks or registered trademarks of Docker, Inc. in the United States and/or other countries. Docker, Inc. and other parties may also have trademark rights in other terms used herein.
 
 confinement: strict
 grade: stable