From 6c80c0027659ebd0fd610127dd03e3733d9ebf60 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 3 Dec 2017 21:22:03 -0500 Subject: [PATCH 01/11] Resolves: #1502378 - initial build Signed-off-by: Lokesh Mandvekar --- container-tools.yaml | 81 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 container-tools.yaml diff --git a/container-tools.yaml b/container-tools.yaml new file mode 100644 index 0000000..701ab6a --- /dev/null +++ b/container-tools.yaml @@ -0,0 +1,81 @@ +--- +document: modulemd +version: 1 +data: + summary: Common tools and dependencies for container runtimes + description: Contains SELinux policies, binaries and other + dependencies for use with container runtimes + license: + module: + - MIT + dependencies: + buildrequires: + golang: 1.9 + platform: f27 + perl: 5.26 + requires: + platform: f27 + references: + community: https://github.com/projectatomic + documentation: https://projectatomic.io + tracker: https://github.com/projectatomic + profiles: + default: + rpms: + - atomic + - buildah + - container-selinux + - container-storage-setup + - oci-register-machine + - oci-systemd-hook + - oci-umount + - python-docker + - runc + - skopeo + api: + rpms: + - atomic + - atomic-registries + - buildah + - container-selinux + - container-storage-setup + - oci-register-machine + - oci-systemd-hook + - oci-umount + - python2-docker + - python3-docker + - runc + - skopeo + - skopeo-containers + components: + rpms: + atomic: + rationale: Primary component of this module + ref: f27 + buildah: + rationale: Primary component of this module + ref: f27 + container-selinux: + rationale: Primary component of this module + ref: f27 + container-storage-setup: + rationale: Primary component of this module + ref: f27 + oci-register-machine: + rationale: Primary component of this module + ref: f27 + oci-systemd-hook: + rationale: Primary component of this module + ref: f27 + oci-umount: + rationale: Primary component of this module + ref: f27 + python-docker: + rationale: Primary component of this module + ref: f27 + runc: + rationale: Primary component of this module + ref: f27 + skopeo: + rationale: Primary component of this module + ref: f27 From 86abc9358245369847e218d325a22c2067a2b335 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 3 Dec 2017 23:41:07 -0500 Subject: [PATCH 02/11] add python[2,3]-ecosystem as deps Needed for python[2,3]-docker Signed-off-by: Lokesh Mandvekar --- container-tools.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/container-tools.yaml b/container-tools.yaml index 701ab6a..9d29b25 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -13,8 +13,12 @@ data: golang: 1.9 platform: f27 perl: 5.26 + python2-ecosystem: f27 + python3-ecosystem: f27 requires: platform: f27 + python2-ecosystem: f27 + python3-ecosystem: f27 references: community: https://github.com/projectatomic documentation: https://projectatomic.io From 327a8c49c02dffb35ccecae1b52af91990c027dd Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 4 Dec 2017 10:18:37 -0500 Subject: [PATCH 03/11] add python[2,3]-pycreds to package list disable tests to reduce python-docker deps Signed-off-by: Lokesh Mandvekar --- container-tools.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/container-tools.yaml b/container-tools.yaml index 9d29b25..06aece6 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -34,6 +34,7 @@ data: - oci-systemd-hook - oci-umount - python-docker + - python-docker-pycreds - runc - skopeo api: @@ -47,10 +48,16 @@ data: - oci-systemd-hook - oci-umount - python2-docker + - python2-docker-pycreds - python3-docker + - python3-docker-pycreds - runc - skopeo - skopeo-containers + buildopts: + rpms: + macros: | + %_with_ignore_tests 1 components: rpms: atomic: @@ -77,6 +84,9 @@ data: python-docker: rationale: Primary component of this module ref: f27 + python-docker-pycreds: + rationale: Primary component of this module + ref: f27 runc: rationale: Primary component of this module ref: f27 From c9c9bfedfa40d770e7319711aff5e6f3ed052b55 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 4 Dec 2017 10:53:56 -0500 Subject: [PATCH 04/11] add build deps for oci-umount and oci-systemd-hook Signed-off-by: Lokesh Mandvekar --- container-tools.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/container-tools.yaml b/container-tools.yaml index 06aece6..4d87223 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -10,11 +10,14 @@ data: - MIT dependencies: buildrequires: + autotools: f27 golang: 1.9 + golang-ecosystem: 2017.0 platform: f27 perl: 5.26 python2-ecosystem: f27 python3-ecosystem: f27 + udisks2: 2 requires: platform: f27 python2-ecosystem: f27 From 2714a7a3976f45ded7cc6219e0dde1885219e1a8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 4 Dec 2017 15:44:56 -0500 Subject: [PATCH 05/11] include ostree temporarily Signed-off-by: Lokesh Mandvekar --- container-tools.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/container-tools.yaml b/container-tools.yaml index 4d87223..98d8425 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -36,6 +36,7 @@ data: - oci-register-machine - oci-systemd-hook - oci-umount + - ostree - python-docker - python-docker-pycreds - runc @@ -50,6 +51,9 @@ data: - oci-register-machine - oci-systemd-hook - oci-umount + - ostree + - ostree-libs + - ostree-devel - python2-docker - python2-docker-pycreds - python3-docker @@ -81,9 +85,15 @@ data: oci-systemd-hook: rationale: Primary component of this module ref: f27 + buildorder: 1 oci-umount: rationale: Primary component of this module ref: f27 + buildorder: 1 + ostree: + rationale: Build dep for some packages (temp) + ref: f27 + buildorder: 0 python-docker: rationale: Primary component of this module ref: f27 From 1232069e65c745c8ebbb32b1368703a41e2c6577 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 4 Dec 2017 18:46:12 -0500 Subject: [PATCH 06/11] Revert "include ostree temporarily" try to build other packages without ostree if possible This reverts commit 2714a7a3976f45ded7cc6219e0dde1885219e1a8. --- container-tools.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/container-tools.yaml b/container-tools.yaml index 98d8425..4d87223 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -36,7 +36,6 @@ data: - oci-register-machine - oci-systemd-hook - oci-umount - - ostree - python-docker - python-docker-pycreds - runc @@ -51,9 +50,6 @@ data: - oci-register-machine - oci-systemd-hook - oci-umount - - ostree - - ostree-libs - - ostree-devel - python2-docker - python2-docker-pycreds - python3-docker @@ -85,15 +81,9 @@ data: oci-systemd-hook: rationale: Primary component of this module ref: f27 - buildorder: 1 oci-umount: rationale: Primary component of this module ref: f27 - buildorder: 1 - ostree: - rationale: Build dep for some packages (temp) - ref: f27 - buildorder: 0 python-docker: rationale: Primary component of this module ref: f27 From 5b75de4223d38652533eb111e2e27b8dad84b11a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 13 Mar 2018 02:33:58 -0400 Subject: [PATCH 07/11] update modulemd to use latest dep branch names Signed-off-by: Lokesh Mandvekar --- container-tools.yaml | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/container-tools.yaml b/container-tools.yaml index 4d87223..965cfe1 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -10,18 +10,11 @@ data: - MIT dependencies: buildrequires: - autotools: f27 - golang: 1.9 - golang-ecosystem: 2017.0 - platform: f27 - perl: 5.26 - python2-ecosystem: f27 - python3-ecosystem: f27 - udisks2: 2 + platform: f28 + golang: "1.10" + golang-ecosystem: "2017.0" requires: - platform: f27 - python2-ecosystem: f27 - python3-ecosystem: f27 + platform: f28 references: community: https://github.com/projectatomic documentation: https://projectatomic.io @@ -65,34 +58,34 @@ data: rpms: atomic: rationale: Primary component of this module - ref: f27 + ref: f28 buildah: rationale: Primary component of this module - ref: f27 + ref: f28 container-selinux: rationale: Primary component of this module - ref: f27 + ref: f28 container-storage-setup: rationale: Primary component of this module - ref: f27 + ref: f28 oci-register-machine: rationale: Primary component of this module - ref: f27 + ref: f28 oci-systemd-hook: rationale: Primary component of this module - ref: f27 + ref: f28 oci-umount: rationale: Primary component of this module - ref: f27 + ref: f28 python-docker: rationale: Primary component of this module - ref: f27 + ref: f28 python-docker-pycreds: rationale: Primary component of this module - ref: f27 + ref: f28 runc: rationale: Primary component of this module - ref: f27 + ref: f28 skopeo: rationale: Primary component of this module - ref: f27 + ref: f28 From fc5acc650b5ee7c91d945e189e51b49de30e09be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Mon, 9 Apr 2018 19:55:43 +0200 Subject: [PATCH 08/11] Updating to modulemd v2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Šabata --- container-tools.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/container-tools.yaml b/container-tools.yaml index 965cfe1..c5f8a40 100644 --- a/container-tools.yaml +++ b/container-tools.yaml @@ -1,6 +1,6 @@ --- document: modulemd -version: 1 +version: 2 data: summary: Common tools and dependencies for container runtimes description: Contains SELinux policies, binaries and other @@ -9,12 +9,12 @@ data: module: - MIT dependencies: - buildrequires: - platform: f28 - golang: "1.10" - golang-ecosystem: "2017.0" - requires: - platform: f28 + - buildrequires: + platform: [] + golang: [1.10] + golang-ecosystem: [2017.0] + requires: + platform: [] references: community: https://github.com/projectatomic documentation: https://projectatomic.io From d07cd95c416260a0429f71aa4fe902bccaafa5a8 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 16 Aug 2018 09:56:49 -0400 Subject: [PATCH 09/11] Rebuild for F30 branch Signed-off-by: Stephen Gallagher From eef39c487fcfdffb12a4a18d3fccec8f0ea48d35 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 16 Aug 2018 15:44:50 -0400 Subject: [PATCH 10/11] Rebuild for F30 branch Signed-off-by: Stephen Gallagher From 3567c110c4ddff19e1e1d4003326ae0d684319c8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 28 Jan 2020 06:47:49 -0500 Subject: [PATCH 11/11] not shipped anymore --- README.md | 3 --- dead.module | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 README.md create mode 100644 dead.module diff --git a/README.md b/README.md deleted file mode 100644 index 8d69fae..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# container-tools - -The container-tools package \ No newline at end of file diff --git a/dead.module b/dead.module new file mode 100644 index 0000000..baabb60 --- /dev/null +++ b/dead.module @@ -0,0 +1 @@ +not shipped anymore