From d435480f75637a77180a5f6bcc5d3df9b9641f48 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 20 Aug 2018 19:30:01 +0200 Subject: [PATCH 1/3] 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 be9ee85..15b4642 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:rawhide +FROM registry.fedoraproject.org/fedora:29 ENV container=docker FLANNELD_ETCD_ENDPOINTS="http://127.0.0.1:2379" FLANNELD_ETCD_PREFIX="/atomic.io/network" From b066a5b3202e6b0cc8b6aec1c37119ad365d8432 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 20 Aug 2018 19:30:19 +0200 Subject: [PATCH 2/3] 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 15b4642..57c3551 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,10 @@ FROM registry.fedoraproject.org/fedora:29 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 " \ From 3cede381826cc3a2447b0f58dc9a97015d12be04 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 20 Aug 2018 19:31:12 +0200 Subject: [PATCH 3/3] 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 be9ee85..b36dd50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,10 @@ FROM registry.fedoraproject.org/fedora:rawhide 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 " \