From 8aff9763a22a3e29111cf09ed22216284759c4d0 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 15 Dec 2016 23:41:19 -0600 Subject: [PATCH 01/36] bump release for test build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3a9b00f..56e1f5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=125 RELEASE=1.2 +ENV VERSION=125 RELEASE=1.3 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From fe8becb04e3962abc274f3ca9a9268bfd4ac93ad Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 15 Dec 2016 23:49:33 -0600 Subject: [PATCH 02/36] switch to fedora:26 base image for rawhide --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 56e1f5e..7530547 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:25 +FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" ENV VERSION=125 RELEASE=1.3 From 0e2146c8eea9cbe156470ffc71acab4be0955651 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Fri, 16 Dec 2016 00:15:13 -0600 Subject: [PATCH 03/36] bump release for test build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7530547..43402af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" -ENV VERSION=125 RELEASE=1.3 +ENV VERSION=125 RELEASE=1.4 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From aa2a3d7c5ccaa76c91e3af91579581e6eeb0270b Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 22 Dec 2016 10:57:59 -0600 Subject: [PATCH 04/36] bump spec for test build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 43402af..6d6e47e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" -ENV VERSION=125 RELEASE=1.4 +ENV VERSION=125 RELEASE=1.5 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 4017cc15da7cfea583c8224c0a470ca470a0fcb2 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 22 Dec 2016 11:51:35 -0600 Subject: [PATCH 05/36] bump release for demo build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6d6e47e..22a852b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 MAINTAINER "Stef Walter" -ENV VERSION=125 RELEASE=1.5 +ENV VERSION=125 RELEASE=1.6 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 4462f08e86aedd3ec287eff7fd36975d98ee0bd8 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 16 Feb 2017 12:20:46 -0600 Subject: [PATCH 06/36] update to latest upstream --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3a9b00f..a4b75b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=125 RELEASE=1.2 +ENV VERSION=130 RELEASE=1 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 1813a1a515b2b4ba1b4da5326bb7ad8cfc3174a2 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Mon, 20 Feb 2017 15:03:45 -0600 Subject: [PATCH 07/36] Bump RELEASE for automatic rebuild --- Dockerfile | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/Dockerfile b/Dockerfile index a4b75b6..e69de29 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,31 +0,0 @@ -FROM registry.fedoraproject.org/fedora:25 -MAINTAINER "Stef Walter" - -ENV VERSION=130 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 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 - -# 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 RUN /usr/bin/docker run -d --privileged --pid=host -v /:/host IMAGE /container/atomic-run --local-ssh - -# Look ma, no EXPOSE - -CMD ["/container/atomic-run"] From eba037c9745cca4c120ad29421232d1621917b18 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Mon, 20 Feb 2017 15:05:00 -0600 Subject: [PATCH 08/36] Revert "Bump RELEASE for automatic rebuild" This reverts commit 1813a1a515b2b4ba1b4da5326bb7ad8cfc3174a2. Testing automatic rebuild script, there is clearly a bug. --- Dockerfile | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/Dockerfile b/Dockerfile index e69de29..a4b75b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -0,0 +1,31 @@ +FROM registry.fedoraproject.org/fedora:25 +MAINTAINER "Stef Walter" + +ENV VERSION=130 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 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 + +# 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 RUN /usr/bin/docker run -d --privileged --pid=host -v /:/host IMAGE /container/atomic-run --local-ssh + +# Look ma, no EXPOSE + +CMD ["/container/atomic-run"] From 35686f795b21a5d1352e275512938a3fe8e5397d Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Mon, 20 Feb 2017 15:20:50 -0600 Subject: [PATCH 09/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a4b75b6..8374d66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=130 RELEASE=1 +ENV VERSION=130 RELEASE=1.1 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 2d722e3a29835de95fdea8594a4ec37ba54a811f Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 28 Feb 2017 10:35:58 -0600 Subject: [PATCH 10/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8374d66..cfed1d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=130 RELEASE=1.1 +ENV VERSION=130 RELEASE=1.2 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 4e5d38dcc5bd5433c9c395b3724f7bc40d7d5232 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 2 Mar 2017 20:21:20 -0600 Subject: [PATCH 11/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cfed1d9..848b7cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=130 RELEASE=1.2 +ENV VERSION=130 RELEASE=1.3 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 5a89b2f994be77e958d1ce35bcf462a8d1d84a4a Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 7 Mar 2017 17:40:24 -0600 Subject: [PATCH 12/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 848b7cd..f70c935 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=130 RELEASE=1.3 +ENV VERSION=130 RELEASE=1.4 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 59ee9505408f3c1ed84fee4b39636d9f7f72f92c Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 15 Mar 2017 16:45:18 -0500 Subject: [PATCH 13/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f70c935..ec46010 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=130 RELEASE=1.4 +ENV VERSION=130 RELEASE=1.5 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 7aa15b4a083c0f98debfd81245354cb870c99689 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 15 Mar 2017 16:45:47 -0500 Subject: [PATCH 14/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ec46010..b34fa68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=130 RELEASE=1.5 +ENV VERSION=130 RELEASE=1.6 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From fc8c2e6cc224569461ab85613f49991594291911 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 15 Mar 2017 16:48:50 -0500 Subject: [PATCH 15/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b34fa68..0a2e165 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=130 RELEASE=1.6 +ENV VERSION=130 RELEASE=1.7 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 39483bd840f4f6479404b6a05a179229ca24c761 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 15 Mar 2017 17:23:18 -0500 Subject: [PATCH 16/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0a2e165..8917d50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=130 RELEASE=1.7 +ENV VERSION=130 RELEASE=1.8 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 588879a8621e46735c01109bc214e6119bacfb70 Mon Sep 17 00:00:00 2001 From: petervo Date: Thu, 23 Mar 2017 15:05:06 -0700 Subject: [PATCH 17/36] 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 8917d50..538d42f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,16 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=130 RELEASE=1.8 +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 47960ad04115f85e17c66909c242f62cb99d78bb Mon Sep 17 00:00:00 2001 From: petervo Date: Thu, 23 Mar 2017 15:03:03 -0700 Subject: [PATCH 18/36] 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 c065d39da71c839d3142354337b8c83190a97ae2 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 29 Mar 2017 15:16:04 -0500 Subject: [PATCH 19/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 538d42f..2045e7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=1 +ENV VERSION=135 RELEASE=2 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 71ea0c6bf5d38620334d093d8de1e46928206904 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 29 Mar 2017 15:16:26 -0500 Subject: [PATCH 20/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2045e7e..3e0ea03 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=2 +ENV VERSION=135 RELEASE=3 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 71639ff52a92219d07db397833f0bd4b8f26c27e Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 29 Mar 2017 22:37:57 -0500 Subject: [PATCH 21/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3e0ea03..68d4b0b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=3 +ENV VERSION=135 RELEASE=4 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 0bc56173393922dea36167a13cef66dbcc4baa32 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 20 Apr 2017 21:31:02 -0500 Subject: [PATCH 22/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 68d4b0b..aec66b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=4 +ENV VERSION=135 RELEASE=5 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 7ccefbae284c9d4ce32eea2dfbac6fae53cdcd8a Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 20 Apr 2017 21:32:41 -0500 Subject: [PATCH 23/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index aec66b0..29b3d08 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=5 +ENV VERSION=135 RELEASE=6 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 5572bed79cc267a84fe76578866dda825508c13b Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 23 May 2017 15:31:55 -0500 Subject: [PATCH 24/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 29b3d08..3c8edfc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=6 +ENV VERSION=135 RELEASE=7 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From 8a9191228783b1f539ca7f1124aaf4cedfb3f813 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 8 Jun 2017 22:18:49 -0500 Subject: [PATCH 25/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3c8edfc..a2b6202 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=7 +ENV VERSION=135 RELEASE=8 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From a6e92b82113b77eb21b4024623cc087fbfbc0772 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 14 Jun 2017 16:25:17 -0500 Subject: [PATCH 26/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a2b6202..dcc0c59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=8 +ENV VERSION=135 RELEASE=9 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From e9ce6df1203910c3990690660a9d22b360a4548b Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 27 Jun 2017 10:45:22 -0500 Subject: [PATCH 27/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dcc0c59..990f357 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=9 +ENV VERSION=135 RELEASE=10 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From c52b839664b2c09959dad311f05b3ad76e20842f Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 6 Jul 2017 14:04:34 -0500 Subject: [PATCH 28/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 990f357..566f150 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=10 +ENV VERSION=135 RELEASE=11 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From ab68f90d78a8160c2584a985373c37e7264c5852 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 25 Jul 2017 12:53:44 -0500 Subject: [PATCH 29/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 566f150..eb86d87 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=11 +ENV VERSION=135 RELEASE=12 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From d614930e17d168547875cf2b17925d1f3cda8caa Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 24 Aug 2017 15:39:27 -0500 Subject: [PATCH 30/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index eb86d87..fdd0f06 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=12 +ENV VERSION=135 RELEASE=13 LABEL BZComponent="cockpit" \ Name="$FGC/cockpit" \ Version="$VERSION" \ From c3292770fe776d8a10fc1377359a2c32533111c6 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 21 Sep 2017 10:24:48 -0500 Subject: [PATCH 31/36] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fdd0f06..8aca91a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 MAINTAINER "Stef Walter" -ENV VERSION=135 RELEASE=13 +ENV VERSION=135 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 32/36] 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 b28310fccb011232546ef0860fd843b66741f44d Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mon, 20 Aug 2018 17:08:30 +0200 Subject: [PATCH 33/36] 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 34/36] 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 35/36] 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 36/36] 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" \