From efe3d6626935a4ab58423c1b03d294cd957a24f0 Mon Sep 17 00:00:00 2001 From: Cockpit Project Date: Mon, 26 Sep 2016 19:37:02 +0000 Subject: [PATCH 01/12] Ensure correct version of cockpit-ws is installed --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ee4b64e..eb15cd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ LABEL BZComponent="cockpit" \ Release="$RELEASE" \ Architecture="x86_64" -RUN dnf install -y cockpit-ws +RUN dnf install -y cockpit-ws-$VERSION-$RELEASE # And the stuff that starts the container RUN mkdir -p /container && ln -s /host/proc/1 /container/target-namespace From 04f548129d2a6d178157c7d91356b39485840abc Mon Sep 17 00:00:00 2001 From: Cockpit Project Date: Mon, 26 Sep 2016 19:37:35 +0000 Subject: [PATCH 02/12] Bump version and rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index eb15cd3..0647ed0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:24 MAINTAINER "Adam Miller" -ENV VERSION=0.95 RELEASE=0.7 +ENV VERSION=0.117 RELEASE=0.1 LABEL BZComponent="cockpit" \ Name="fedora/cockpit" \ Version="$VERSION" \ From 99b1e11ca1a64c0277e8a1dc7ab5116eccc39891 Mon Sep 17 00:00:00 2001 From: Cockpit Project Date: Mon, 26 Sep 2016 19:44:58 +0000 Subject: [PATCH 03/12] Bump version and rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0647ed0..4b57214 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:24 MAINTAINER "Adam Miller" -ENV VERSION=0.117 RELEASE=0.1 +ENV VERSION=0.117 RELEASE=1 LABEL BZComponent="cockpit" \ Name="fedora/cockpit" \ Version="$VERSION" \ From 3a98e45b25e830c73ef0c9c7a54e7488e5911a70 Mon Sep 17 00:00:00 2001 From: Cockpit Project Date: Thu, 29 Sep 2016 21:37:02 +0000 Subject: [PATCH 04/12] Add package name suffix When supplying version and release of the cockpit-ws package to dnf, it can't find the right package without also stating the suffix, e.g. '.fc24'. --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4b57214..1f05f78 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM registry.fedoraproject.org/fedora:24 MAINTAINER "Adam Miller" -ENV VERSION=0.117 RELEASE=1 +ENV VERSION=0.117 RELEASE=1 SUFFIX=fc24 LABEL BZComponent="cockpit" \ Name="fedora/cockpit" \ Version="$VERSION" \ Release="$RELEASE" \ Architecture="x86_64" -RUN dnf install -y cockpit-ws-$VERSION-$RELEASE +RUN dnf install -y cockpit-ws-$VERSION-$RELEASE.$SUFFIX # And the stuff that starts the container RUN mkdir -p /container && ln -s /host/proc/1 /container/target-namespace From 4e57fac32d2c0d3d530d8c245f235a5bd24b21d2 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Mon, 17 Oct 2016 13:15:26 -0500 Subject: [PATCH 05/12] bump Release for testing --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1f05f78..a13a555 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM registry.fedoraproject.org/fedora:24 MAINTAINER "Adam Miller" -ENV VERSION=0.117 RELEASE=1 SUFFIX=fc24 +ENV VERSION=0.117 RELEASE=1.1 SUFFIX=fc24 LABEL BZComponent="cockpit" \ Name="fedora/cockpit" \ Version="$VERSION" \ Release="$RELEASE" \ Architecture="x86_64" -RUN dnf install -y cockpit-ws-$VERSION-$RELEASE.$SUFFIX +RUN dnf install -y cockpit-ws-$VERSION-1.$SUFFIX # And the stuff that starts the container RUN mkdir -p /container && ln -s /host/proc/1 /container/target-namespace From 425cd6a09c7b13b882a59aaeaa2c66f5376fd521 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 20 Oct 2016 10:55:56 -0500 Subject: [PATCH 06/12] bump release for test build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a13a555..05b7b72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:24 MAINTAINER "Adam Miller" -ENV VERSION=0.117 RELEASE=1.1 SUFFIX=fc24 +ENV VERSION=0.117 RELEASE=1.2 SUFFIX=fc24 LABEL BZComponent="cockpit" \ Name="fedora/cockpit" \ Version="$VERSION" \ From fe543a6bf15137c466ec5f779c0dd43be531b3fe Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 25 Oct 2016 09:43:36 -0500 Subject: [PATCH 07/12] bump release for test build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 05b7b72..bfa7a88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:24 MAINTAINER "Adam Miller" -ENV VERSION=0.117 RELEASE=1.2 SUFFIX=fc24 +ENV VERSION=0.117 RELEASE=1.3 SUFFIX=fc24 LABEL BZComponent="cockpit" \ Name="fedora/cockpit" \ Version="$VERSION" \ From c065150e81729986b2ad5ca133c8d6ef0ee30351 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 26 Oct 2016 14:45:24 -0500 Subject: [PATCH 08/12] bump spec for test build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bfa7a88..64d1fc4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:24 MAINTAINER "Adam Miller" -ENV VERSION=0.117 RELEASE=1.3 SUFFIX=fc24 +ENV VERSION=0.117 RELEASE=1.4 SUFFIX=fc24 LABEL BZComponent="cockpit" \ Name="fedora/cockpit" \ Version="$VERSION" \ From a693bb794f6b57ad44a8f95123b4c1c98c22930c Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 8 Dec 2016 12:30:10 -0600 Subject: [PATCH 09/12] add FGC (Fedora Generational Core) and DISTTAG, bump release for test build Signed-off-by: Adam Miller --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 From 8d6b83a243b358580c9eb79397f96d7cb5ae7425 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Fri, 9 Dec 2016 11:55:42 -0600 Subject: [PATCH 10/12] bump spec for test build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b027756..f349e07 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM fedora:24 MAINTAINER "Adam Miller" -ENV NAME=cockpit VERSION=0.117 RELEASE=1.5 +ENV NAME=cockpit VERSION=0.117 RELEASE=1.6 LABEL BZComponent="cockpit" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From fa89fad94d416f6082bb361b9207c50687b4efd9 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Fri, 9 Dec 2016 12:11:19 -0600 Subject: [PATCH 11/12] bump spec for test build, add sleep for debugging --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f349e07..09662d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM fedora:24 MAINTAINER "Adam Miller" -ENV NAME=cockpit VERSION=0.117 RELEASE=1.6 +ENV NAME=cockpit VERSION=0.117 RELEASE=1.7 LABEL BZComponent="cockpit" \ Name="$FGC/$NAME" \ Version="$VERSION" \ @@ -10,6 +10,8 @@ LABEL BZComponent="cockpit" \ RUN dnf install -y $NAME +RUN sleep 216000 + # And the stuff that starts the container RUN mkdir -p /container && ln -s /host/proc/1 /container/target-namespace ADD atomic-install /container/atomic-install From 38d9d4ad6353bcfcdf43184f36a37713821c14f8 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Fri, 9 Dec 2016 12:42:08 -0600 Subject: [PATCH 12/12] bump spec for test build, --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 09662d2..daeaf09 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM fedora:24 MAINTAINER "Adam Miller" -ENV NAME=cockpit VERSION=0.117 RELEASE=1.7 +ENV NAME=cockpit VERSION=0.117 RELEASE=1.8 LABEL BZComponent="cockpit" \ Name="$FGC/$NAME" \ Version="$VERSION" \ @@ -10,8 +10,6 @@ LABEL BZComponent="cockpit" \ RUN dnf install -y $NAME -RUN sleep 216000 - # And the stuff that starts the container RUN mkdir -p /container && ln -s /host/proc/1 /container/target-namespace ADD atomic-install /container/atomic-install