From a693bb794f6b57ad44a8f95123b4c1c98c22930c Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Dec 08 2016 18:30:10 +0000 Subject: add FGC (Fedora Generational Core) and DISTTAG, bump release for test build Signed-off-by: Adam Miller --- diff --git a/Dockerfile b/Dockerfile index 64d1fc4..b027756 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM registry.fedoraproject.org/fedora:24 +FROM fedora:24 MAINTAINER "Adam Miller" -ENV VERSION=0.117 RELEASE=1.4 SUFFIX=fc24 +ENV NAME=cockpit VERSION=0.117 RELEASE=1.5 LABEL BZComponent="cockpit" \ - Name="fedora/cockpit" \ + Name="$FGC/$NAME" \ Version="$VERSION" \ - Release="$RELEASE" \ + Release="$RELEASE.$DISTTAG" \ Architecture="x86_64" -RUN dnf install -y cockpit-ws-$VERSION-1.$SUFFIX +RUN dnf install -y $NAME # And the stuff that starts the container RUN mkdir -p /container && ln -s /host/proc/1 /container/target-namespace