From 2f9efddbe42879a47983044a781441da7bc01e6e Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Mon, 17 Sep 2018 09:50:47 -0400 Subject: [PATCH 1/2] Revert "Revert "rdgo/overlay.yml: No longer build docker"" This reverts commit ec3c5cfd119c63880815f31e96282fdd55c874da. --- rdgo/overlay.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rdgo/overlay.yml b/rdgo/overlay.yml index 886cd6c7..6fb63ee8 100644 --- a/rdgo/overlay.yml +++ b/rdgo/overlay.yml @@ -15,10 +15,6 @@ root: mock: centos-7-and-extras-$arch.cfg components: - - src: github:projectatomic/docker - override-version: "1.13.1" - branch: docker-1.13.1-rhel - # pull ignition directly from copr for now # - src: github:coreos/ignition # distgit: From 1b82d310e42920aa8e9d834f1c55962f007fa0f0 Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Mon, 17 Sep 2018 09:50:57 -0400 Subject: [PATCH 2/2] Revert "Revert "host-maipo.yaml: Drop docker from compose"" This reverts commit ed2c104c9721dbd63a14286e1ed65cb13518bf8b. --- host-maipo.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/host-maipo.yaml b/host-maipo.yaml index 741b9b35..9b236aac 100644 --- a/host-maipo.yaml +++ b/host-maipo.yaml @@ -22,9 +22,6 @@ mutate-os-release: "4.0" packages: # auth legacy - authconfig - # Docker legacy - - docker docker-lvm-plugin docker-novolume-plugin - - oci-umount # SELinux - policycoreutils-python # Networking legacy