From 35bbe4ca5e4e190aa20119535e7e3027b61dff31 Mon Sep 17 00:00:00 2001 From: Frantisek Kluknavsky Date: Jun 12 2018 15:11:56 +0000 Subject: Merge branch 'master' into f27 --- diff --git a/.gitignore b/.gitignore index b92d515..032604e 100644 --- a/.gitignore +++ b/.gitignore @@ -169,3 +169,5 @@ /libnetwork-c15b372.tar.gz /runc-345dcfa.tar.gz /docker-6c336e4.tar.gz +/container-storage-setup-65f91d4.tar.gz +/runc-18eb957.tar.gz diff --git a/docker.spec b/docker.spec index 0933185..f754211 100644 --- a/docker.spec +++ b/docker.spec @@ -49,7 +49,7 @@ # d-s-s %global git_dss https://github.com/projectatomic/container-storage-setup/ -%global commit_dss 9b77bcb2cba8e272799fa21e2d484e9f6e7c34d0 +%global commit_dss 65f91d4976c2bfd6aa9fe105a402a3c6495ce5d0 %global shortcommit_dss %(c=%{commit_dss}; echo ${c:0:7}) %global dss_datadir %{_datadir}/%{repo}-storage-setup @@ -67,7 +67,7 @@ # docker-runc %global git_runc https://github.com/projectatomic/runc/ -%global commit_runc 345dcfaa2b9640d68aba61924789463a041d1299 +%global commit_runc 18eb957e56a79e03fd43c37581200e3f4f392676 %global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7}) # docker-containerd @@ -100,7 +100,7 @@ Name: %{repo} Epoch: 2 %endif Version: 1.13.1 -Release: 54.git%{shortcommit_docker}%{?dist} +Release: 58.git%{shortcommit_docker}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo} @@ -216,11 +216,9 @@ Obsoletes: %{repo}-storage-setup <= 0.5-3 Requires: libseccomp >= 2.3.0 %if 0%{?fedora} || 0%{?rhel} > 7 -Recommends: oci-register-machine Recommends: oci-systemd-hook Recommends: criu %else -Requires: oci-register-machine Requires: oci-systemd-hook Requires: criu %endif @@ -1030,6 +1028,21 @@ exit 0 %{_unitdir}/%{repo}-lvm-plugin.* %changelog +* Tue Jun 12 2018 Frantisek Kluknavsky - 2:1.13.1-58.git6c336e4 +- built docker-runc @projectatomic/docker-1.13.1 commit 18eb957 + +* Wed Jun 06 2018 Frantisek Kluknavsky - 2:1.13.1-57.git6c336e4 +- remove outdated comment about docker_transition_unconfined + +* Thu May 24 2018 Frantisek Kluknavsky - 2:1.13.1-56.git6c336e4 +- rebased container-storage-setup to 0.11.0 commit 65f91d4 + +* Wed May 23 2018 Colin Walters - 2:1.13.1-55.git6c336e4 +- Drop oci-register-machine Recommends; this broke a downstream build because + oci-register-machine was missing systemd-nspawn as a dependency, but generally + it has not been worth maintaining. + See previous discussion: https://lists.projectatomic.io/projectatomic-archives/atomic-devel/2016-May/msg00051.html + * Mon May 21 2018 Frantisek Kluknavsky - 2:1.13.1-54.git6c336e4 - Resolves: #1559274 - built docker @projectatomic/docker-1.13.1 commit 6c336e4 diff --git a/docker.sysconfig b/docker.sysconfig index 418a7ff..46c5e56 100644 --- a/docker.sysconfig +++ b/docker.sysconfig @@ -10,10 +10,6 @@ fi # from the atomic-registries package. # -# On an SELinux system, if you remove the --selinux-enabled option, you -# also need to turn on the docker_transition_unconfined boolean. -# setsebool -P docker_transition_unconfined 1 - # Location used for temporary files, such as those created by # docker load and build operations. Default is /var/lib/docker/tmp # Can be overriden by setting the following environment variable. diff --git a/seccomp.json b/seccomp.json index b9a4564..4286aea 100644 --- a/seccomp.json +++ b/seccomp.json @@ -55,7 +55,7 @@ "accept", "accept4", "access", - "alarm", + "adjtimex", "alarm", "bind", "brk", @@ -223,10 +223,12 @@ "prctl", "pread64", "preadv", + "preadv2", "prlimit64", "pselect6", "pwrite64", "pwritev", + "pwritev2", "read", "readahead", "readlink", @@ -411,6 +413,40 @@ "args": [ { "index": 0, + "value": 131072, + "valueTwo": 0, + "op": "SCMP_CMP_EQ" + } + ], + "comment": "", + "includes": {}, + "excludes": {} + }, + { + "names": [ + "personality" + ], + "action": "SCMP_ACT_ALLOW", + "args": [ + { + "index": 0, + "value": 131080, + "valueTwo": 0, + "op": "SCMP_CMP_EQ" + } + ], + "comment": "", + "includes": {}, + "excludes": {} + }, + { + "names": [ + "personality" + ], + "action": "SCMP_ACT_ALLOW", + "args": [ + { + "index": 0, "value": 4294967295, "valueTwo": 0, "op": "SCMP_CMP_EQ" @@ -422,6 +458,23 @@ }, { "names": [ + "sync_file_range2" + ], + "action": "SCMP_ACT_ALLOW", + "args": [], + "comment": "", + "includes": { + "arches": [ + "ppc64le" + ] + }, + "excludes": {} + }, + { + "names": [ + "arm_fadvise64_64", + "arm_sync_file_range", + "sync_file_range2", "breakpoint", "cacheflush", "set_tls" @@ -508,6 +561,7 @@ "mount", "name_to_handle_at", "perf_event_open", + "quotactl", "setdomainname", "sethostname", "setns", @@ -623,6 +677,23 @@ }, { "names": [ + "get_mempolicy", + "mbind", + "name_to_handle_at", + "set_mempolicy" + ], + "action": "SCMP_ACT_ALLOW", + "args": [], + "comment": "", + "includes": { + "caps": [ + "CAP_SYS_NICE" + ] + }, + "excludes": {} + }, + { + "names": [ "acct" ], "action": "SCMP_ACT_ALLOW", @@ -671,7 +742,7 @@ "names": [ "settimeofday", "stime", - "adjtimex" + "clock_settime" ], "action": "SCMP_ACT_ALLOW", "args": [], @@ -698,4 +769,4 @@ "excludes": {} } ] -} \ No newline at end of file +} diff --git a/sources b/sources index fa72d34..af36f33 100644 --- a/sources +++ b/sources @@ -1,9 +1,9 @@ -SHA512 (container-storage-setup-9b77bcb.tar.gz) = b329b9e374b217cfcb9e4244f8b961886c5d3f986eabe11a000bdcfedc29d6ac4954c72ccb3987a78069f05dc9dadbcc1da752791197a6c98b99bb60336520b5 +SHA512 (container-storage-setup-65f91d4.tar.gz) = 1494e9905b9b8dbffe051161c550ea54c90e6040c141cf7bdf65274462189b51d92fe252449998ced93083769defad310f87a85163dc26e16324a337ff082518 SHA512 (containerd-375cb68.tar.gz) = d4411eb3415f0df077889d9bf6c3a7b561a461c5e6b7a6daa16f67b62453105257c518cb703364ef4f356b158dda14f1f7d374067710fb14b2666536c145b832 SHA512 (docker-6c336e4.tar.gz) = 4772e1600aa50873087dba36e6d4579c6b90dd320447221aae3ec0d2d4e28695eca112751de3c73f233a5ef4e6b20a67fc811aa11e9d06bf0e1c84ca079abc73 SHA512 (docker-lvm-plugin-04caa55.tar.gz) = 33d670575cd5f207c616598ff924b6b6a73265fa908075e53462626ba72d39fe02085ac8330079807a8cb8799760b4807f27ef803875291988ff7f15024f4db3 SHA512 (docker-novolume-plugin-385ec70.tar.gz) = 267558fe8903821f0900cca4d67f7937f0cdf9d2d5be8bcdb90ce0de0931668fecb47d836debabcc00b611c71456f5c920b431083cbb8190589d11dfc978f0e8 SHA512 (libnetwork-c15b372.tar.gz) = 300e197313017536f91768ba675f2ab773eb1914f8e5908f4ff5b6fc8c4f0fa5ba1653cd9f8ca26e7c466f1623716aa45a2746f862e47ca9fe9136010085f600 SHA512 (rhel-push-plugin-af9107b.tar.gz) = e17c8970edff2eae4a2cc7f5a09a054171700032f2e6d15b043f3ebdb902385a95c4afed3cedd67e5d7bf4292a0b945f7c84f84f1162930fc8f365825110e573 -SHA512 (runc-345dcfa.tar.gz) = 5df00e7ad26ed1378a6ad1c1649bada5d943a077f44aa1a3a560202c04714a748176b5163841e16fb88e6a5fa4cd80579509643a48e96201b581acc70509ce70 +SHA512 (runc-18eb957.tar.gz) = 94ede6be3e26c44e6edb0fdb35a03b5a1d64246d29813d86953b6ccb8a8647bd1c84bf7083e5a627046809c389d0a53c3335f4dd9be9f9f0b0eaa6a73c37f78e SHA512 (tini-5b117de.tar.gz) = ccfd8c7c3666c319237e2f634f76b7bbf90665b9d26977facbe836df081b0bbacf8443b3d9f9ab0dc3498d1ef90e5b6ddd98a38af33d47e7c6be1c4d392eb9cb