commit b121698e22f6a93007350b04210443f983ac9f48 Merge: 8900613 1bf9197 Author: Lokesh Mandvekar <l...@fedoraproject.org> Date: Thu Jan 29 17:31:40 2015 +0000
MountFlags=slave in unitfile NVR: docker-io-1.4.1-8 Signed-off-by: Lokesh Mandvekar <l...@fedoraproject.org> .gitignore | 4 ++++ docker-io.spec | 39 +++++++++++++-------------------------- docker.service | 5 ++--- docker.sysconfig | 6 +++++- 4 files changed, 24 insertions(+), 30 deletions(-) --- diff --cc docker-io.spec index 890afe4,38d2351..4ec84cb --- a/docker-io.spec +++ b/docker-io.spec @@@ -33,33 -33,32 +33,14 @@@ Source6: %{repo}-network.sysconfi Patch0: %{repo}-cert-path.patch BuildRequires: glibc-static BuildRequires: golang >= 1.3.3 --# for gorilla/mux and kr/pty https://github.com/dotcloud/docker/pull/5950 - #BuildRequires: golang(github.com/gorilla/mux) >= 0-0.13 - #BuildRequires: golang(github.com/kr/pty) >= 0-0.19 - #BuildRequires: golang(github.com/godbus/dbus) - # for coreos/go-systemd https://github.com/dotcloud/docker/pull/5981 - #BuildRequires: golang(github.com/coreos/go-systemd) >= 2-1 - #BuildRequires: golang(code.google.com/p/go.net/websocket) - #BuildRequires: golang(code.google.com/p/gosqlite/sqlite3) - # Resolves: rhbz#1109039 use syndtr/gocapability >= 0-0.7 - #BuildRequires: golang(github.com/syndtr/gocapability/capability) >= 0-0.7 - ##BuildRequires: golang(github.com/docker/libcontainer) >= 1.2.0-3 - #BuildRequires: golang(github.com/tchap/go-patricia/patricia) - #BuildRequires: golang(github.com/docker/libtrust) >= 0-0.2 - #BuildRequires: golang(github.com/docker/libtrust/trustgraph) >= 0-0.2 - #BuildRequires: golang(github.com/Sirupsen/logrus) >= 0.6.0 -BuildRequires: golang(github.com/gorilla/mux) >= 0-0.13 -BuildRequires: golang(github.com/kr/pty) >= 0-0.19 -BuildRequires: golang(github.com/godbus/dbus) -# for coreos/go-systemd https://github.com/dotcloud/docker/pull/5981 -BuildRequires: golang(github.com/coreos/go-systemd/activation) >= 2-1 -BuildRequires: golang(code.google.com/p/go.net/websocket) -BuildRequires: golang(code.google.com/p/gosqlite/sqlite3) -# Resolves: rhbz#1109039 use syndtr/gocapability >= 0-0.7 -BuildRequires: golang(github.com/syndtr/gocapability/capability) >= 0-0.7 -#BuildRequires: golang(github.com/docker/libcontainer) >= 1.2.0-3 -BuildRequires: golang(github.com/tchap/go-patricia/patricia) -BuildRequires: golang(github.com/docker/libtrust) >= 0-0.2 -BuildRequires: golang(github.com/docker/libtrust/trustgraph) >= 0-0.2 -BuildRequires: golang(github.com/Sirupsen/logrus) >= 0.6.0 BuildRequires: go-md2man BuildRequires: device-mapper-devel BuildRequires: btrfs-progs-devel BuildRequires: pkgconfig(systemd) -# Use appropriate NVR for systemd-units to ensure SocketUser and SocketGroup are available +BuildRequires: sqlite-devel - # Use appropriate NVR for systemd-units to ensure SocketUser and SocketGroup are available %if 0%{?fedora} >= 21 --Requires: systemd >= 214 # Resolves: rhbz#1165615 Requires: device-mapper-libs >= 1.02.90-1 --%else --Requires: systemd >= 208-20 %endif # Resolves: rhbz#1045220 @@@ -390,9 -388,18 +369,17 @@@ exit %{_datadir}/zsh/site-functions/_docker %changelog - * Fri Jan 22 2015 Lokesh Mandvekar <l...@fedoraproject.org> - 1.4.1-6 - - run tests inside a docker repo - - use vendored deps itself + * Fri Jan 23 2015 Lokesh Mandvekar <l...@fedoraproject.org> - 1.4.1-8 + - Resolves:rhbz#1185423 - MountFlags=slave in unitfile -- use golang(github.com/coreos/go-systemd/activation) + + * Fri Jan 16 2015 Lokesh Mandvekar <l...@fedoraproject.org> - 1.4.1-7 + - docker group no longer used or created + - no socket activation + - config file updates to include info about docker_transition_unconfined + boolean + + * Fri Jan 16 2015 Lokesh Mandvekar <l...@fedoraproject.org> - 1.4.1-6 + - run tests inside a docker repo (doesn't affect koji builds - not built) * Tue Jan 13 2015 Lokesh Mandvekar <l...@fedoraproject.org> - 1.4.1-5 - Resolves: rhbz#1169593 patch to set DOCKER_CERT_PATH regardless of config file _______________________________________________ golang mailing list golang@lists.fedoraproject.org https://lists.fedoraproject.org/mailman/listinfo/golang