From a4c34c4f2dbdf1f663438a8915d0454e581415bc Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 16 May 2018 10:25:33 +0200 Subject: [PATCH 01/12] Dockerfile: update FROM Signed-off-by: Giuseppe Scrivano --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6a61659..3bbb0c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:rawhide +FROM registry.fedoraproject.org/fedora:28 ENV VERSION=0 RELEASE=1 ARCH=x86_64 LABEL com.redhat.component="docker" \ From 4fa43434dd6fb844fc9df16a2f642347501ad6f7 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 16 May 2018 10:28:09 +0200 Subject: [PATCH 02/12] Dockerfile: bump release Signed-off-by: Giuseppe Scrivano --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3bbb0c2..0316a63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:28 -ENV VERSION=0 RELEASE=1 ARCH=x86_64 +ENV VERSION=0 RELEASE=2 ARCH=x86_64 LABEL com.redhat.component="docker" \ name="docker" \ version="$VERSION" \ From 91634cd69aea2486e2112b5f7c438837e6d34f2a Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 16 May 2018 16:11:04 +0200 Subject: [PATCH 03/12] Dockerfile: update Signed-off-by: Giuseppe Scrivano --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0316a63..4abf2c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,8 +11,8 @@ LABEL com.redhat.component="docker" \ maintainer="Giuseppe Scrivano " \ atomic.type="system" -RUN dnf install --setopt=tsflags=nodocs -y docker container-storage-setup container-selinux cloud-utils-growpart python-docker-py docker-novolume-plugin lvm2 iptables procps-ng xz oci-register-machine \ - && rpm -V docker container-storage-setup container-selinux cloud-utils-growpart python-docker-py docker-novolume-plugin lvm2 iptables procps-ng xz oci-register-machine \ +RUN dnf install --setopt=tsflags=nodocs -y docker container-storage-setup container-selinux cloud-utils-growpart docker-novolume-plugin lvm2 iptables procps-ng xz oci-register-machine \ + && rpm -V docker container-storage-setup container-selinux cloud-utils-growpart docker-novolume-plugin lvm2 iptables procps-ng xz oci-register-machine \ && mkdir -p /usr/lib/modules && dnf clean all RUN ln -s /usr/libexec/docker/docker-runc-current /usr/bin/docker-runc From e242a437dd88fb1b637494611f84afe7b02bdcfa Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 21 May 2018 14:19:53 +0000 Subject: [PATCH 04/12] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4abf2c0..8c1f4a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:28 -ENV VERSION=0 RELEASE=2 ARCH=x86_64 +ENV VERSION=0 RELEASE=3 ARCH=x86_64 LABEL com.redhat.component="docker" \ name="docker" \ version="$VERSION" \ From 295249b873fb3085f5afba46095adc607d02b072 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 21 May 2018 17:56:37 +0000 Subject: [PATCH 05/12] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8c1f4a2..c5a0080 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:28 -ENV VERSION=0 RELEASE=3 ARCH=x86_64 +ENV VERSION=0 RELEASE=4 ARCH=x86_64 LABEL com.redhat.component="docker" \ name="docker" \ version="$VERSION" \ From 87c5122b08c1505b4f3b854a8698f18d18358f0b Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Fri, 25 May 2018 10:25:05 +0200 Subject: [PATCH 06/12] Bump Release so we can rebuild the image in OSBS Signed-off-by: Clement Verna --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c5a0080..d43ca33 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:28 -ENV VERSION=0 RELEASE=4 ARCH=x86_64 +ENV VERSION=0 RELEASE=5 ARCH=x86_64 LABEL com.redhat.component="docker" \ name="docker" \ version="$VERSION" \ From b5a250d3d9b50535f422a27416d4e2c5aa618e45 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Fri, 25 May 2018 10:37:10 +0200 Subject: [PATCH 07/12] Container name should have the FGC(fxx) variable defined Signed-off-by: Clement Verna --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d43ca33..c65a137 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM registry.fedoraproject.org/fedora:28 ENV VERSION=0 RELEASE=5 ARCH=x86_64 LABEL com.redhat.component="docker" \ - name="docker" \ + name="$FGC/docker" \ version="$VERSION" \ release="$RELEASE.$DISTTAG" \ architecture="$ARCH" \ From 7d20121dec81a33e5fc16cb41f966485108397c8 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Wed, 30 May 2018 19:20:52 +0000 Subject: [PATCH 08/12] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c65a137..5d85952 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:28 -ENV VERSION=0 RELEASE=5 ARCH=x86_64 +ENV VERSION=0 RELEASE=6 ARCH=x86_64 LABEL com.redhat.component="docker" \ name="$FGC/docker" \ version="$VERSION" \ From c8654d3eb515a6d808db6e8e1b3be5e792bd0b36 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 9 Jul 2018 13:32:10 +0000 Subject: [PATCH 09/12] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5d85952..7bed788 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:28 -ENV VERSION=0 RELEASE=6 ARCH=x86_64 +ENV VERSION=0 RELEASE=7 ARCH=x86_64 LABEL com.redhat.component="docker" \ name="$FGC/docker" \ version="$VERSION" \ From daf44608694cecd78fdf420008904d0e2dfbe1bc Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 23 Jul 2018 13:10:12 +0000 Subject: [PATCH 10/12] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7bed788..9ba9baf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:28 -ENV VERSION=0 RELEASE=7 ARCH=x86_64 +ENV VERSION=0 RELEASE=8 ARCH=x86_64 LABEL com.redhat.component="docker" \ name="$FGC/docker" \ version="$VERSION" \ From 9ce868681886d23e693043faf61c212a19588777 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 24 Jul 2018 18:51:47 +0000 Subject: [PATCH 11/12] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9ba9baf..ace048e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:28 -ENV VERSION=0 RELEASE=8 ARCH=x86_64 +ENV VERSION=0 RELEASE=9 ARCH=x86_64 LABEL com.redhat.component="docker" \ name="$FGC/docker" \ version="$VERSION" \ From d9d750294a009a28ac017a4884d802fdc1cee023 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Wed, 22 Aug 2018 22:56:35 +0200 Subject: [PATCH 12/12] Drop Release label in favor of OSBS release_bump plugin. OSBS can automatically bump the release number, for that we just need to drop the label from the Dockerfile See https://pagure.io/ContainerSIG/container-sig/issue/1 Signed-off-by: Clement Verna --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ace048e..772c678 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,9 @@ FROM registry.fedoraproject.org/fedora:28 -ENV VERSION=0 RELEASE=9 ARCH=x86_64 +ENV VERSION=0 ARCH=x86_64 LABEL com.redhat.component="docker" \ name="$FGC/docker" \ version="$VERSION" \ - release="$RELEASE.$DISTTAG" \ architecture="$ARCH" \ usage="atomic install --system --system-package=no docker && systemctl start docker" \ summary="The docker daemon as a system container." \