From 38f7cc6ca09b625d7e57bb5933d12edc8174e186 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 20 Aug 2018 17:37:42 +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 3ed87e3..7653a59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:rawhide +FROM registry.fedoraproject.org/fedora:f29 MAINTAINER "Randy Barlow" ENV NAME=docker-distribution VERSION=2.6.2 RELEASE=1 ARCH=x86_64 From e5889cd33e89e1d593ac4d645c6de19b77ee2269 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 20 Aug 2018 17:37:05 +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 7653a59..4b84e07 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ FROM registry.fedoraproject.org/fedora:f29 MAINTAINER "Randy Barlow" -ENV NAME=docker-distribution VERSION=2.6.2 RELEASE=1 ARCH=x86_64 +ENV NAME=docker-distribution VERSION=2.6.2 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ - Release="$RELEASE.$DISTTAG" \ Architecture="$ARCH" RUN dnf install -y docker-distribution-2.6.2 && dnf clean all From 2b9b88aefa5c486ebf54ef7300310924dee2b9d2 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 20 Aug 2018 18:06:15 +0200 Subject: [PATCH 3/3] Use the correct tag for f29 base image. Signed-off-by: Clement Verna --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4b84e07..7d415eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:f29 +FROM registry.fedoraproject.org/fedora:29 MAINTAINER "Randy Barlow" ENV NAME=docker-distribution VERSION=2.6.2 ARCH=x86_64