From fc0f23f5f2be334a06694987525a798e0217f323 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 20 Aug 2018 17:57:33 +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 004a94b..6454a7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:rawhide +FROM registry.fedoraproject.org/fedora:29 ENV VERSION=0.1 RELEASE=10 ARCH=x86_64 LABEL com.redhat.component="etcd" \ From fb2b7647eb59461d784a57f59dda9bcc077c2334 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 20 Aug 2018 17:57:50 +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 6454a7e..3e5dc4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,9 @@ FROM registry.fedoraproject.org/fedora:29 -ENV VERSION=0.1 RELEASE=10 ARCH=x86_64 +ENV VERSION=0.1 ARCH=x86_64 LABEL com.redhat.component="etcd" \ name="$FGC/etcd" \ version="$VERSION" \ - release="$RELEASE.$DISTTAG" \ architecture="$ARCH" \ summary="A key-value store for shared configuration and service discovery." \ maintainer="Giuseppe Scrivano " From 4853917726c203108ea75291de755a650f3502e5 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 20 Aug 2018 17:58:48 +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 004a94b..0d30616 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,9 @@ FROM registry.fedoraproject.org/fedora:rawhide -ENV VERSION=0.1 RELEASE=10 ARCH=x86_64 +ENV VERSION=0.1 ARCH=x86_64 LABEL com.redhat.component="etcd" \ name="$FGC/etcd" \ version="$VERSION" \ - release="$RELEASE.$DISTTAG" \ architecture="$ARCH" \ summary="A key-value store for shared configuration and service discovery." \ maintainer="Giuseppe Scrivano "