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

Proposed by Merlijn Sebrechts
Status: Merged
Approved by: Tianon Gravi
Approved revision: bfdb20c473348f82173a757dcfa64c886cf1b88b
Merge reported by: Tianon Gravi
Merged at revision: bfdb20c473348f82173a757dcfa64c886cf1b88b
Proposed branch: ~merlijn-sebrechts/+git/snap:master
Merge into: ~docker/+git/snap:master
Diff against target: 23 lines (+11/-2)
1 file modified
snap/snapcraft.yaml (+11/-2)
Reviewer Review Type Date Requested Status
Tianon Gravi Approve
Ian Johnson (community) Approve
Review via email:

Description of the change

Update metadata to explain where to find config files

To post a comment you must log in.
Revision history for this message
Ian Johnson (anonymouse67) wrote :

lgtm, also needs Tianon's approval however

review: Approve
Revision history for this message
Tianon Gravi (tianon) wrote :

TIL (again?) launchpad has Merge Requests :D

LGTM, thanks :)

review: Approve
Revision history for this message
Tianon Gravi (tianon) wrote :

... 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?)

Revision history for this message
Merlijn Sebrechts (merlijn-sebrechts) wrote :

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`, 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.

Revision history for this message
Ian Johnson (anonymouse67) wrote :

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

Revision history for this message
Tianon Gravi (tianon) wrote :

I've done one better and merged this to, which is now the canonical (heh) source of the snap.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
2index 5f64c45..b49d6f4 100644
3--- a/snap/snapcraft.yaml
4+++ b/snap/snapcraft.yaml
5@@ -1,7 +1,16 @@
6 name: docker
7+title: Docker
8 version: '19.03.11'
9-summary: Docker Linux container runtime
10-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.
11+summary: Docker container runtime
12+description: |
13+ Build and run container images with Docker.
15+ * 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.
16+ * You can change the configuration of this build by modifying the files in `/var/snap/docker/current/`.
18+ This snap is built by Canonical based on source code published by Docker, Inc. It is not endorsed or published by Docker, Inc.
20+ 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.
22 confinement: strict
23 grade: stable


People subscribed via source and target branches