From b0142f5a9dcfb48096273ab61763388bf4299552 Mon Sep 17 00:00:00 2001 From: Mike Ruckman Date: Thu, 9 Feb 2017 13:14:24 -0500 Subject: [PATCH 1/2] Updated SSH Dockerfile for Initial Container Review. --- ssh/Dockerfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ssh/Dockerfile b/ssh/Dockerfile index 5e40e610..7bdd28e0 100644 --- a/ssh/Dockerfile +++ b/ssh/Dockerfile @@ -1,8 +1,14 @@ -FROM docker.io/fedora -MAINTAINER http://fedoraproject.org/wiki/Cloud +FROM registry.fedoraproject.org/fedora:25 +LABEL MAINTAINER='http://fedoraproject.org/wiki/Cloud' +ENV NAME=ssh VERSION=0.1 RELEASE=1 # Atomic RUN label, enables the atomic cli -LABEL RUN='docker run --name ssh -d -p 2200:22 $IMAGE' +LABEL RUN='docker run --name ssh -d -p 2200:22 $IMAGE' \ + BZComponent="$NAME" \ + Name="$FGC/$NAME" \ + Version="$VERSION" \ + Release="$RELEASE.$DISTTAG" \ + Architecture="$ARCH" EXPOSE 22 From dd4c16b2db97107656c71b57feec08b6ec13e54b Mon Sep 17 00:00:00 2001 From: Mike Ruckman Date: Thu, 9 Feb 2017 13:45:45 -0500 Subject: [PATCH 2/2] Updated nginx Dockerfile for Initial Container Review. --- nginx/Dockerfile | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/nginx/Dockerfile b/nginx/Dockerfile index fbcfd329..a318c46a 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,8 +1,17 @@ -FROM fedora -MAINTAINER http://fedoraproject.org/wiki/Cloud +FROM registry.fedoraproject.org/fedora:25 +LABEL MAINTAINER='http://fedoraproject.org/wiki/Cloud' -RUN dnf -y update && dnf clean all -RUN dnf -y install nginx && dnf clean all +ENV NAME=nginx VERSION=0.1 RELEASE=1 +# Atomic RUN label, enables the atomic cli +LABEL RUN='docker run --name nginx -d -p 80:80 $IMAGE' \ + BZComponent="$NAME" \ + Name="$FGC/$NAME" \ + Version="$VERSION" \ + Release="$RELEASE.$DISTTAG" \ + Architecture="$ARCH" + + +RUN dnf -y update && dnf -y install nginx && dnf clean all RUN echo "daemon off;" >> /etc/nginx/nginx.conf RUN echo "nginx on Fedora" > /usr/share/nginx/html/index.html