forked from pool/docker
sync with latest changes for docker-1.10 and also sync changelog with
package for SLE OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=83
This commit is contained in:
Jordi Massaguer
Git OBS Bridge
parent
5b9dc986b2
commit
9339aa78a4
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 11 08:44:46 UTC 2016 - asarai@suse.de
|
||||
|
||||
- spec: switch to new done file name from docker-image-migrator
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 11 08:41:49 UTC 2016 - jmassaguerpla@suse.com
|
||||
|
||||
@ -19,6 +24,20 @@ Fri Mar 11 08:41:49 UTC 2016 - jmassaguerpla@suse.com
|
||||
Fix issue preventing daemon to start if userns is enabled and the subuid or subgid files contain comments #20725
|
||||
|
||||
More at https://github.com/docker/docker/releases/tag/v1.10.3
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 10 13:52:54 UTC 2016 - asarai@suse.de
|
||||
|
||||
- spec: improve file-based migration checks to make sure that it doesn't cause
|
||||
errors if running on a /var/lib/docker without /var/lib/docker/graph.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 9 13:45:14 UTC 2016 - asarai@suse.de
|
||||
|
||||
- spec: implement file-based migration checks. The migrator will be updated to
|
||||
match the warning message's instructions. This looks like it works with my
|
||||
testing.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 7 14:09:17 UTC 2016 - normand@linux.vnet.ibm.com
|
||||
|
||||
@ -29,12 +48,6 @@ Mon Mar 7 14:09:17 UTC 2016 - normand@linux.vnet.ibm.com
|
||||
new libnetwork_drivers_bridge_powerpc.patch to replace
|
||||
deleted fix-ppc64le.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 7 11:48:01 UTC 2016 - asarai@suse.com
|
||||
|
||||
- Remove docker-image-migrator for now (there are plenty of issues getting it to
|
||||
work properly at the moment). (bnc#968933)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 1 17:54:41 UTC 2016 - jmassaguerpla@suse.com
|
||||
|
||||
@ -47,7 +60,7 @@ Tue Mar 1 15:28:56 UTC 2016 - jmassaguerpla@suse.com
|
||||
- Require docker-image-migrator (bnc#968933)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 23 08:52:17 UTC 2016 - jmassaguerpla@suse.com
|
||||
Tue Feb 23 08:55:17 UTC 2016 - jmassaguerpla@suse.com
|
||||
|
||||
Update to version 1.10.2 (bnc#968933)
|
||||
|
||||
@ -78,14 +91,19 @@ link to changelog:
|
||||
https://github.com/docker/docker/blob/v1.10.2/CHANGELOG.md
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 15 12:13:16 UTC 2016 - asarai@suse.com
|
||||
Mon Feb 15 09:48:41 UTC 2016 - asarai@suse.com
|
||||
|
||||
- fix-apparmor.patch: switch to a backported version of docker/docker#20305,
|
||||
which also fixes several potential issues if the major version of apparmor
|
||||
changes.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 12 16:01:30 UTC 2016 - jmassaguerpla@suse.com
|
||||
Mon Feb 15 08:35:43 UTC 2016 - asarai@suse.com
|
||||
|
||||
- Remove 1.10.0 tarball.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 12 16:04:19 UTC 2016 - jmassaguerpla@suse.com
|
||||
|
||||
- Update to docker 1.10.1
|
||||
It includes some fixes to 1.10.0, see detailed changelog in
|
||||
@ -93,9 +111,9 @@ Fri Feb 12 16:01:30 UTC 2016 - jmassaguerpla@suse.com
|
||||
https://github.com/docker/docker/blob/v1.10.1/CHANGELOG.md
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 5 09:14:15 UTC 2016 - jmassaguerpla@suse.com
|
||||
Tue Feb 9 17:24:46 UTC 2016 - jmassaguerpla@suse.com
|
||||
|
||||
- Update to 1.10.0 version (bnc#965918)
|
||||
- Update docker to 1.10.0 (bnc#965918)
|
||||
|
||||
Add usernamespace support
|
||||
Add support for custom seccomp profiles
|
||||
@ -105,7 +123,6 @@ detailed changelog in
|
||||
|
||||
https://github.com/docker/docker/blob/590d5108bbdaabb05af590f76c9757daceb6d02e/CHANGELOG.md
|
||||
|
||||
|
||||
- removed patches, because code has been merged in 1.10.0 release:
|
||||
libcontainer-apparmor-fixes.patch: see: https://github.com/docker/docker/blob/release/v1.10/contrib/apparmor/template.go
|
||||
fix_bnc_958255.patch: see https://github.com/docker/docker/commit/2b4f64e59018c21aacbf311d5c774dd5521b5352
|
||||
@ -135,6 +152,7 @@ https://github.com/docker/docker/blob/590d5108bbdaabb05af590f76c9757daceb6d02e/C
|
||||
fix-apparmor.patch: fix https://github.com/docker/docker/issues/20269 . It affects SLE12 which has apparmor
|
||||
version 2.8 and not openSUSE which has version 2.9.
|
||||
fix-ppc64le.patch: Build netlink driver using int8 and not uint8 for the data structure
|
||||
|
||||
|
||||
- reviewed patches:
|
||||
ignore-dockerinit-checksum.patch: review context in patch
|
||||
|
||||
53
docker.spec
53
docker.spec
@ -16,6 +16,10 @@
|
||||
#
|
||||
|
||||
|
||||
%define docker_store /var/lib/docker
|
||||
%define docker_graph %{docker_store}/graph
|
||||
%define docker_migration_testfile %{docker_store}/.suse-image-migration-v1to2-complete
|
||||
|
||||
%define git_version 9e83765
|
||||
%define go_arches %ix86 x86_64
|
||||
Name: docker
|
||||
@ -254,6 +258,55 @@ install -p -m 644 man/man5/Dockerfile.5 %{buildroot}%{_mandir}/man5
|
||||
%fdupes %{buildroot}
|
||||
|
||||
%pre
|
||||
# We're currently inside rpmlint, which will cause us to fail the tests if it
|
||||
# happens that the Docker install in the builder requires a migration. $BUILD
|
||||
if [[ -z "$BUILD_ROOT" && -z "$DOCKER_FORCE_IMAGE_MIGRATION" ]]
|
||||
then
|
||||
# In order to make sure we don't print a scary warning when we shouldn't we
|
||||
# need to test these things (in this order):
|
||||
# 1. Check that /var/lib/docker actually exists (docker daemon has run).
|
||||
# 2. Check that the migrator has *not* finished.
|
||||
# 3. Check that /var/lib/docker/graph exists (this is a <=1.9.1 thing, but
|
||||
# will stick around if it has been migrated -- which is why we need the
|
||||
# MIGRATION_TESTFILE check).
|
||||
# 4. Check that there are images in the graph/ directory.
|
||||
if [[ -d "%{docker_store}" && ( ! -f "%{docker_migration_testfile}" ) && -d "%{docker_store}" && -n "$(find "%{docker_store}" -maxdepth 1 -type d 2>/dev/null | grep -Ev '_tmp|^%{docker_store}$')" ]]
|
||||
then
|
||||
cat >&2 <<EOF
|
||||
|
||||
*** WARNING ***
|
||||
|
||||
In the migration from docker<1.10.0 to docker>=1.10.0, the Docker image format
|
||||
has changed to be completely content-addressible. This results in several positive
|
||||
improvements to image operations (better caching during builds mainly). However,
|
||||
the migration operation may take several hours if you have a lot of large images
|
||||
on a Docker host. In order to ensure that you have minimum downtime, this update
|
||||
of Docker will not complete successfully, and you will have the opportunity to
|
||||
run a separate migration tool (which will not cause downtime for your Docker
|
||||
daemon).
|
||||
|
||||
In order to run this migration tool, please install docker-image-migrator package.
|
||||
|
||||
However, if you prefer to not run this separate migration tool, you can force this
|
||||
update using the following command. THIS WILL CAUSE DOWNTIME, BECAUSE DOCKER WILL
|
||||
RUN THE MIGRATION ON FIRST START AND YOU WILL BE UNABLE TO START ANY CONTAINERS
|
||||
OR USE ANY DOCKER COMMANDS (EVEN CONTAINERS WITH RESTART POLICIES ACTIVE):
|
||||
|
||||
$ DOCKER_FORCE_IMAGE_MIGRATION=1 sudo -E zypper up docker
|
||||
EOF
|
||||
|
||||
# Fail the update.
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# In order to make sure that we don't accidentally cause problems with an
|
||||
# upgrade to docker>=1.10.2, we'll touch the same file we tested in (2).
|
||||
# -m701 is *not* a typo, it is necessary for certain syscalls with remapped
|
||||
# root.
|
||||
[[ -d "%{docker_store}" ]] || install -d -m701 %{docker_store} || :
|
||||
touch %{docker_migration_testfile}
|
||||
fi
|
||||
|
||||
echo "creating group docker..."
|
||||
groupadd -r docker 2>/dev/null || :
|
||||
%service_add_pre %{name}.service %{name}.socket
|
||||
|
||||
Loading…
Reference in New Issue
Block a user