From 7cbbfe6d49fd2be31a27264adfe42bc43acd4543 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 20 Aug 2018 19:28:14 +0200 Subject: [PATCH 1/2] Use f28 tag for f28 branch Signed-off-by: Clement Verna --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index be9ee85..9fa7c14 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:rawhide +FROM registry.fedoraproject.org/fedora:28 ENV container=docker FLANNELD_ETCD_ENDPOINTS="http://127.0.0.1:2379" FLANNELD_ETCD_PREFIX="/atomic.io/network" From 7008106850469e37fbf341e212d6509ed5a477b2 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 20 Aug 2018 19:29:33 +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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9fa7c14..446129b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,10 @@ FROM registry.fedoraproject.org/fedora:28 ENV container=docker FLANNELD_ETCD_ENDPOINTS="http://127.0.0.1:2379" FLANNELD_ETCD_PREFIX="/atomic.io/network" -ENV VERSION=0 RELEASE=8 ARCH=x86_64 +ENV VERSION=0 ARCH=x86_64 LABEL com.redhat.component="flannel" \ name="$FGC/flannel" \ version="$VERSION" \ - release="$RELEASE.$DISTTAG" \ architecture="$ARCH" \ summary="An etcd driven address agent, intended to be run as a system container" \ maintainer="Giuseppe Scrivano " \