From 034077e32d078085f8cbe7e6ffd71c0e14c08259 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 20 Aug 2018 17:31:04 +0200 Subject: [PATCH 1/2] Use f29 tag for f29 branch Signed-off-by: Clement Verna --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6a61659..c9b7a0d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:rawhide +FROM registry.fedoraproject.org/fedora:f29 ENV VERSION=0 RELEASE=1 ARCH=x86_64 LABEL com.redhat.component="docker" \ From 2b254fadb1d7362d3a7c538369edd0cb52588d6a Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 20 Aug 2018 17:31:30 +0200 Subject: [PATCH 2/2] 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 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c9b7a0d..519d819 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,9 @@ -FROM registry.fedoraproject.org/fedora:f29 +FROM registry.fedoraproject.org/fedora:29 -ENV VERSION=0 RELEASE=1 ARCH=x86_64 +ENV VERSION=0 ARCH=x86_64 LABEL com.redhat.component="docker" \ name="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." \