From 4391715cc413c8ce48fb34e49dc044ae5dd4ee4c Mon Sep 17 00:00:00 2001 From: Micah Abbott Date: Thu, 16 Nov 2017 17:30:57 +0000 Subject: [PATCH 01/23] Dockerfile: update for Fedora 27 release Update the FROM line to Fedora 27 base image and change VERSION according to guidelines. --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f729de..d3652bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM registry.fedoraproject.org/fedora:26 +FROM registry.fedoraproject.org/fedora:27 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=1 +ENV VERSION=0 RELEASE=1 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 30ae9e73d645f916723db7455f9ea9f5f0e34dcf Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 9 Jan 2018 17:00:04 +0000 Subject: [PATCH 02/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d3652bd..d523239 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:27 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=1 +ENV VERSION=0 RELEASE=2 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From e2f2126cca84812ccfb4c4f53d79072931836a29 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 9 Jan 2018 17:06:31 +0000 Subject: [PATCH 03/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d523239..83d66d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:27 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=2 +ENV VERSION=0 RELEASE=3 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 75b75ad2135dd990d872b1acf64058f4f50d2cf9 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 18 Jan 2018 22:35:07 +0000 Subject: [PATCH 04/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 83d66d8..b6793b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:27 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=3 +ENV VERSION=0 RELEASE=4 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From af2ca9f6290a9dfabcf2b71d5279ea4e7ba3e3bf Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 18 Jan 2018 23:04:04 +0000 Subject: [PATCH 05/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b6793b1..99359df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:27 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=4 +ENV VERSION=0 RELEASE=5 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 4a8e7770cb6ca43eb24aedddbb027ae22ecc7a83 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 18 Jan 2018 23:11:01 +0000 Subject: [PATCH 06/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 99359df..d9fdfde 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:27 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=5 +ENV VERSION=0 RELEASE=6 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From b1a92b1c05660cbb2d3f5085cb5ed5a4a0a822d0 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 18 Jan 2018 23:18:03 +0000 Subject: [PATCH 07/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d9fdfde..4612483 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:27 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=6 +ENV VERSION=0 RELEASE=7 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 1d95b3eef44d559c24516fb312d403d1942ada4a Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 18 Jan 2018 23:24:38 +0000 Subject: [PATCH 08/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4612483..dd86581 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:27 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=7 +ENV VERSION=0 RELEASE=8 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 5d9a505487552f86ef0f89a146a927d31dfa7c46 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Fri, 16 Feb 2018 14:58:05 +0000 Subject: [PATCH 09/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dd86581..d90eb51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:27 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=8 +ENV VERSION=0 RELEASE=9 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 8bf4f3b37f388120cfa06c7487e91ee4d6d13107 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 1 Mar 2018 17:00:32 +0000 Subject: [PATCH 10/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d90eb51..3cfede2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:27 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=9 +ENV VERSION=0 RELEASE=10 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 9bfe90f0a606d55ed111a9d9062fe57a6ba10079 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 1 Mar 2018 18:31:11 +0000 Subject: [PATCH 11/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3cfede2..1c035de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:27 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=10 +ENV VERSION=0 RELEASE=11 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 2bf688259a62c224b80b71ff74f0a6eb89caef12 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 15 Mar 2018 15:30:27 +0000 Subject: [PATCH 12/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1c035de..f3bc01a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:27 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=11 +ENV VERSION=0 RELEASE=12 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 62241a7a2099951fe886cfc83e3b4763c8e61585 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 29 Mar 2018 14:11:24 +0000 Subject: [PATCH 13/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f3bc01a..fc73031 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:27 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=12 +ENV VERSION=0 RELEASE=13 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From e2dd7ea85d8fa8a07a326f622b30e31504f1d688 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Fri, 20 Apr 2018 14:10:20 +0000 Subject: [PATCH 14/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fc73031..bff6912 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:27 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=13 +ENV VERSION=0 RELEASE=14 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 8f01b0e1935d3cb66203957391c10ab11a8f2f35 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 2 May 2018 19:14:15 +0200 Subject: [PATCH 15/23] Update for cockpit 166 and Fedora 29 --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f729de..bd78fe4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM registry.fedoraproject.org/fedora:26 +FROM registry.fedoraproject.org/fedora:29 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 ac2bf067257102862526c00f420f9a0c6f39b165 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 21 May 2018 15:52:55 +0000 Subject: [PATCH 16/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bff6912..5db2c1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:27 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=14 +ENV VERSION=0 RELEASE=15 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From ab9b930e4f3220e45e1f49ee4279ea5ea534b31a Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Fri, 6 Jul 2018 13:41:08 +0000 Subject: [PATCH 17/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5db2c1a..1fd9331 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:27 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=15 +ENV VERSION=0 RELEASE=16 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From d3cd275a994278edec5ed73edf6fe523c154df7e Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 17 Jul 2018 13:03:10 +0000 Subject: [PATCH 18/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1fd9331..7b66023 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:27 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=16 +ENV VERSION=0 RELEASE=17 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 245fdfaaa0a8f73066f7b354a325856b95a8d80c Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 17 Jul 2018 18:45:33 +0000 Subject: [PATCH 19/23] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7b66023..08aa040 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:27 MAINTAINER "Stef Walter" -ENV VERSION=0 RELEASE=17 +ENV VERSION=0 RELEASE=18 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From b28310fccb011232546ef0860fd843b66741f44d Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 20 Aug 2018 17:08:30 +0200 Subject: [PATCH 20/23] 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 bd78fe4..7c039db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ FROM registry.fedoraproject.org/fedora:29 MAINTAINER "Stef Walter" -ENV VERSION=166 RELEASE=1 +ENV VERSION=166 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ - Release="$RELEASE.$DISTTAG" \ Architecture="x86_64" From 62c6ef4f947f247205044953c4a1ec6c5f38b101 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 20 Aug 2018 17:17:28 +0200 Subject: [PATCH 21/23] Use the rawhide tag for the master branch Signed-off-by: Clement Verna --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7c039db..f7b5c09 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:29 +FROM registry.fedoraproject.org/fedora:rawhide MAINTAINER "Stef Walter" ENV VERSION=166 From 57b1ac75e06359a8ba52d0d98aba00e3bb94439c Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 3 Sep 2018 11:41:00 +0200 Subject: [PATCH 22/23] Update for Cockpit 176 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f7b5c09..3d8d20b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM registry.fedoraproject.org/fedora:rawhide MAINTAINER "Stef Walter" -ENV VERSION=166 +ENV VERSION=176 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ 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 From f8b02a730c5f121d646254e968f31db1aa61347e Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 8 Nov 2018 21:46:39 +0100 Subject: [PATCH 23/23] Update for Cockpit 181 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3d8d20b..2dedc2f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:rawhide MAINTAINER "Stef Walter" -ENV VERSION=176 +ENV VERSION=181 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \