From 1de3abbdf3d0f8516bc4f8f1f22389eb7b505337 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 2 May 2018 19:14:15 +0200 Subject: [PATCH 01/10] Update for cockpit 166 and Fedora 28 --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f729de..22c8f72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM registry.fedoraproject.org/fedora:26 +FROM registry.fedoraproject.org/fedora:28 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=1 +ENV VERSION=166 RELEASE=1 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ @@ -9,15 +9,15 @@ LABEL BZComponent="cockpit" \ Architecture="x86_64" -RUN dnf install -y cockpit-ws cockpit-dashboard +RUN dnf install -y cockpit-ws cockpit-dashboard && \ + mkdir -p /container && ln -s /host/proc/1 /container/target-namespace && \ + dnf clean all -RUN mkdir -p /container && ln -s /host/proc/1 /container/target-namespace ADD atomic-install /container/atomic-install ADD atomic-uninstall /container/atomic-uninstall ADD atomic-run /container/atomic-run -RUN chmod -v +x /container/atomic-install -RUN chmod -v +x /container/atomic-uninstall -RUN chmod -v +x /container/atomic-run + +RUN chmod -v +x /container/atomic-install /container/atomic-uninstall /container/atomic-run # Make the container think it's the host OS version RUN rm -f /etc/os-release /usr/lib/os-release && ln -sv /host/etc/os-release /etc/os-release && ln -sv /host/usr/lib/os-release /usr/lib/os-release From f19ffa7f365585deb680758f786cac091bc9c42d Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 2 May 2018 22:40:31 +0200 Subject: [PATCH 02/10] Fix VERSION back to 0 As per https://fedoraproject.org/wiki/Container:Guidelines#VERSIONING --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 22c8f72..0f4d5b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:28 MAINTAINER "Stef Walter" -ENV VERSION=166 RELEASE=1 +ENV VERSION=0 RELEASE=1 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From a0d038f43871a2951992044918b6fe4cce72251f Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 21 May 2018 14:18:54 +0000 Subject: [PATCH 03/10] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0f4d5b4..f46ed5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:28 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=1 +ENV VERSION=0 RELEASE=2 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From c417369eb487e59fe53484a81ed514b66135d496 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 21 May 2018 17:55:57 +0000 Subject: [PATCH 04/10] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f46ed5e..9830727 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:28 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=2 +ENV VERSION=0 RELEASE=3 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 2886f239cde4e6afb42b7862564a385b60e28076 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Wed, 30 May 2018 19:20:11 +0000 Subject: [PATCH 05/10] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9830727..1c30dd2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:28 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=3 +ENV VERSION=0 RELEASE=4 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From bdb6a30417b1806be096eef805e6a20c523f6b2a Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 9 Jul 2018 13:31:29 +0000 Subject: [PATCH 06/10] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1c30dd2..1a8d657 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:28 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=4 +ENV VERSION=0 RELEASE=5 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 943e80accdfefa2651791dd53e91ee3155618120 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 23 Jul 2018 13:09:32 +0000 Subject: [PATCH 07/10] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1a8d657..6598116 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:28 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=5 +ENV VERSION=0 RELEASE=6 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 74c20eab97242f34bc4d909ddcfc8162ec0beeff Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 24 Jul 2018 18:51:05 +0000 Subject: [PATCH 08/10] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6598116..7eb7b1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:28 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=6 +ENV VERSION=0 RELEASE=7 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 97fb4d7aca6d83719840120ba41c3a6d4fad1994 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 20 Aug 2018 17:12:56 +0200 Subject: [PATCH 09/10] 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 7eb7b1c..5316c64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ FROM registry.fedoraproject.org/fedora:28 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=7 +ENV VERSION=0 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ - Release="$RELEASE.$DISTTAG" \ Architecture="x86_64" From f623cdc0a8632dbe86ac930cc24627515f6ec4cc Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 3 Sep 2018 11:41:00 +0200 Subject: [PATCH 10/10] Update for Cockpit 176 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5316c64..01e821a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ LABEL BZComponent="cockpit" \ Architecture="x86_64" -RUN dnf install -y cockpit-ws cockpit-dashboard && \ +RUN dnf install -y cockpit-ws cockpit-dashboard cockpit-bridge && \ mkdir -p /container && ln -s /host/proc/1 /container/target-namespace && \ dnf clean all