From b61c9083df2cb00c06a09660b8e333710850fd6d Mon Sep 17 00:00:00 2001 From: yuqi-zhang Date: Mon, 10 Jul 2017 10:58:04 -0400 Subject: [PATCH] Minor fixes for f25 Change "name" label to be the correct format, and remove a rhel plugin. Signed-off-by: Yu Qi Zhang --- Dockerfile | 4 ++-- daemon.json | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 45fb543..fb2890f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM registry.fedoraproject.org/fedora:25 -ENV VERSION=0 RELEASE=4 ARCH=x86_64 +ENV VERSION=0 RELEASE=5 ARCH=x86_64 LABEL com.redhat.component="docker" \ - name="docker" \ + name="$FGC/docker" \ version="$VERSION" \ release="$RELEASE.$DISTTAG" \ architecture="$ARCH" \ diff --git a/daemon.json b/daemon.json index ea5e789..445fe8a 100644 --- a/daemon.json +++ b/daemon.json @@ -1,6 +1,4 @@ - { - "authorization-plugins": ["rhel-push-plugin"], "default-runtime": "oci", "containerd": "/run/containerd.sock", "userland-proxy-path": "/usr/libexec/docker/docker-proxy-current",