From 4719ef149864a9259ec88b7e8913cdbeb5e56834 Mon Sep 17 00:00:00 2001 From: petervo Date: Thu, 23 Mar 2017 15:03:03 -0700 Subject: [PATCH 01/16] Update for cockpit 135 --- Dockerfile | 10 +++++----- atomic-install | 11 +++++++---- atomic-run | 1 + atomic-uninstall | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 22a852b..8f729de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,16 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" -ENV VERSION=125 RELEASE=1.6 +ENV VERSION=135 RELEASE=1 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ Release="$RELEASE.$DISTTAG" \ Architecture="x86_64" -RUN dnf install -y cockpit-ws -# And the stuff that starts the container +RUN dnf install -y cockpit-ws cockpit-dashboard + RUN mkdir -p /container && ln -s /host/proc/1 /container/target-namespace ADD atomic-install /container/atomic-install ADD atomic-uninstall /container/atomic-uninstall @@ -22,8 +22,8 @@ RUN chmod -v +x /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 -LABEL INSTALL /usr/bin/docker run -ti --rm --privileged -v /:/host IMAGE /container/atomic-install -LABEL UNINSTALL /usr/bin/docker run -ti --rm --privileged -v /:/host IMAGE /container/atomic-uninstall +LABEL INSTALL /usr/bin/docker run --rm --privileged -v /:/host IMAGE /container/atomic-install +LABEL UNINSTALL /usr/bin/docker run --rm --privileged -v /:/host IMAGE /container/atomic-uninstall LABEL RUN /usr/bin/docker run -d --privileged --pid=host -v /:/host IMAGE /container/atomic-run --local-ssh # Look ma, no EXPOSE diff --git a/atomic-install b/atomic-install index abc4c61..15d2477 100644 --- a/atomic-install +++ b/atomic-install @@ -17,7 +17,7 @@ if [ ! -f /host/usr/bin/cockpit-bridge ]; then exit 1 fi if [ ! -d /host/usr/share/cockpit ]; then - echo "cockpit-run: cockpit-shell and other resources must be installed in the host" >&2 + echo "cockpit-run: cockpit-system and other resources must be installed in the host" >&2 exit 1 fi if [ -f /host/usr/libexec/cockpit-ws ]; then @@ -34,14 +34,17 @@ set -x sed -e '/pam_selinux/d' -e '/pam_sepermit/d' /etc/pam.d/cockpit > /host/etc/pam.d/cockpit # Make sure that we have required directories in the host -mkdir -p /host/etc/cockpit/ws-certs.d -chmod 755 /host/etc/cockpit/ws-certs.d -chown root:root /host/etc/cockpit/ws-certs.d +mkdir -p /host/etc/cockpit/ws-certs.d /host/etc/cockpit/machines.d +chmod 755 /host/etc/cockpit/ws-certs.d /host/etc/cockpit/machines.d +chown root:root /host/etc/cockpit/ws-certs.d /host/etc/cockpit/machines.d mkdir -p /host/var/lib/cockpit chmod 775 /host/var/lib/cockpit chown root:wheel /host/var/lib/cockpit +# For sharing ssh's known hosts with container +mkdir -p /etc/ssh + # Ensure we have certificates /bin/mount --bind /host/etc/cockpit /etc/cockpit /usr/sbin/remotectl certificate --ensure diff --git a/atomic-run b/atomic-run index 1ddddde..6a096d6 100644 --- a/atomic-run +++ b/atomic-run @@ -15,6 +15,7 @@ set +x /bin/mount --bind /host/usr/share/pixmaps /usr/share/pixmaps /bin/mount --bind /host/var /var +/bin/mount --bind /host/etc/ssh /etc/ssh # And run cockpit-ws exec /usr/bin/nsenter --net=/container/target-namespace/ns/net --uts=/container/target-namespace/ns/uts -- /usr/libexec/cockpit-ws "$@" diff --git a/atomic-uninstall b/atomic-uninstall index 06b49aa..5b4636f 100644 --- a/atomic-uninstall +++ b/atomic-uninstall @@ -16,7 +16,7 @@ if [ ! -f /host/usr/bin/cockpit-bridge ]; then exit 1 fi if [ ! -d /host/usr/share/cockpit ]; then - echo "cockpit-shell and other resources must be installed in the host" >&2 + echo "cockpit-system and other resources must be installed in the host" >&2 exit 1 fi if [ -f /host/usr/libexec/cockpit-ws ]; then From cbe5029fac311306532db3a7e9fe99d08ee91f41 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 25 Jul 2017 16:19:03 -0500 Subject: [PATCH 02/16] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8f729de..c09d1da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=1 +ENV VERSION=135 RELEASE=2 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 2a72f87e68db83822b0e4c34c10a2cacdf8d5d9a Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 24 Aug 2017 16:54:42 -0500 Subject: [PATCH 03/16] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c09d1da..7164026 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=2 +ENV VERSION=135 RELEASE=3 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From e2ad996a6d69a01d51c550282041a982dd3aae0c Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 21 Sep 2017 14:02:04 -0500 Subject: [PATCH 04/16] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7164026..0a21699 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=3 +ENV VERSION=135 RELEASE=4 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 4105401fa46f1565cb57352c7a88df8e63fa2f08 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Mon, 2 Oct 2017 15:10:26 -0500 Subject: [PATCH 05/16] bump RELEASE to run test build (OSBS broke) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0a21699..fe233e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=4 +ENV VERSION=135 RELEASE=5 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 19d738deb86f6cf695bf5675b54c5d21b2615cc4 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Mon, 2 Oct 2017 16:22:18 -0500 Subject: [PATCH 06/16] bump RELEASE to run test build (OSBS broke) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fe233e4..f1e57b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=5 +ENV VERSION=135 RELEASE=6 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From aec6ea2223a6b618f6db5821c682ff6ff20271a0 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 3 Oct 2017 10:19:22 -0500 Subject: [PATCH 07/16] bump RELEASE to run test build (OSBS broke) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f1e57b4..70a7243 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=6 +ENV VERSION=135 RELEASE=7 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 33cb33fa4cc3f6613f390d12268ea3abc7d73d0a Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 3 Oct 2017 14:40:54 -0500 Subject: [PATCH 08/16] bump RELEASE to run test build (OSBS broke) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 70a7243..25d0043 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=7 +ENV VERSION=135 RELEASE=8 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 648927bd5fd69019e35d27dcc86cfc2cf4dc9d31 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 5 Oct 2017 08:05:18 -0500 Subject: [PATCH 09/16] bump RELEASE to run test build (OSBS broke) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 25d0043..0492943 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=8 +ENV VERSION=135 RELEASE=9 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 79db7e6a9b0f699be20c18e5326aa25f8cb019ed Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Fri, 6 Oct 2017 12:05:40 -0500 Subject: [PATCH 10/16] bump RELEASE to run test build (OSBS broke) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0492943..b3574ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=9 +ENV VERSION=135 RELEASE=10 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From de853df75478586b5f67b3bee401f65bc72953eb Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Fri, 6 Oct 2017 16:08:07 -0500 Subject: [PATCH 11/16] bump RELEASE to run test build (OSBS broke) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b3574ba..770d987 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=10 +ENV VERSION=135 RELEASE=11 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From fb80ac4c969254585a3c196882b67dc3d24f076e Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Sat, 7 Oct 2017 00:45:28 +0200 Subject: [PATCH 12/16] bump RELEASE to run test build (OSBS broke) Signed-off-by: Patrick Uiterwijk --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 770d987..82ebc34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=11 +ENV VERSION=135 RELEASE=12 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From c48503c7d57abfe8d997d0274cf662355f6a7a99 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Sat, 7 Oct 2017 03:16:32 +0200 Subject: [PATCH 13/16] bump RELEASE to run test build (OSBS broke) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 82ebc34..16c7d1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=12 +ENV VERSION=135 RELEASE=13 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 8b0861c60d69933c5d1964aa78206b4d6fa0ef54 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Sat, 7 Oct 2017 03:31:48 +0200 Subject: [PATCH 14/16] bump RELEASE to run test build (OSBS broke) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 16c7d1e..001607b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=13 +ENV VERSION=135 RELEASE=14 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From c3b05afaaf1dea80927a2cce8b358bdf6a33a818 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 14 Nov 2017 14:17:38 -0600 Subject: [PATCH 15/16] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 001607b..dd93246 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=14 +ENV VERSION=135 RELEASE=15 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 386a0f917663fe29178587ebadc1764117409113 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 15 Mar 2018 14:39:58 +0000 Subject: [PATCH 16/16] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dd93246..3d7b9c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=15 +ENV VERSION=135 RELEASE=16 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \