Compare commits

...
Sign in to create a new pull request.

25 commits

Author SHA1 Message Date
Adam Miller
c3292770fe Bump RELEASE for automatic rebuild 2017-09-21 10:24:48 -05:00
Adam Miller
d614930e17 Bump RELEASE for automatic rebuild 2017-08-24 15:39:27 -05:00
Adam Miller
ab68f90d78 Bump RELEASE for automatic rebuild 2017-07-25 12:53:44 -05:00
Adam Miller
c52b839664 Bump RELEASE for automatic rebuild 2017-07-06 14:04:34 -05:00
Adam Miller
e9ce6df120 Bump RELEASE for automatic rebuild 2017-06-27 10:45:22 -05:00
Adam Miller
a6e92b8211 Bump RELEASE for automatic rebuild 2017-06-14 16:25:17 -05:00
Adam Miller
8a91912287 Bump RELEASE for automatic rebuild 2017-06-08 22:18:49 -05:00
Adam Miller
5572bed79c Bump RELEASE for automatic rebuild 2017-05-23 15:31:55 -05:00
Adam Miller
7ccefbae28 Bump RELEASE for automatic rebuild 2017-04-20 21:32:41 -05:00
Adam Miller
0bc5617339 Bump RELEASE for automatic rebuild 2017-04-20 21:31:02 -05:00
Adam Miller
71639ff52a Bump RELEASE for automatic rebuild 2017-03-29 22:37:57 -05:00
Adam Miller
71ea0c6bf5 Bump RELEASE for automatic rebuild 2017-03-29 15:16:26 -05:00
Adam Miller
c065d39da7 Bump RELEASE for automatic rebuild 2017-03-29 15:16:04 -05:00
petervo
588879a862 Update for cockpit 135 2017-03-23 15:05:14 -07:00
Adam Miller
39483bd840 Bump RELEASE for automatic rebuild 2017-03-15 17:23:18 -05:00
Adam Miller
fc8c2e6cc2 Bump RELEASE for automatic rebuild 2017-03-15 16:48:50 -05:00
Adam Miller
7aa15b4a08 Bump RELEASE for automatic rebuild 2017-03-15 16:45:47 -05:00
Adam Miller
59ee950540 Bump RELEASE for automatic rebuild 2017-03-15 16:45:18 -05:00
Adam Miller
5a89b2f994 Bump RELEASE for automatic rebuild 2017-03-07 17:40:24 -06:00
Adam Miller
4e5d38dcc5 Bump RELEASE for automatic rebuild 2017-03-02 20:21:20 -06:00
Adam Miller
2d722e3a29 Bump RELEASE for automatic rebuild 2017-02-28 10:35:58 -06:00
Adam Miller
35686f795b Bump RELEASE for automatic rebuild 2017-02-20 15:20:50 -06:00
Adam Miller
eba037c974 Revert "Bump RELEASE for automatic rebuild"
This reverts commit 1813a1a515.

Testing automatic rebuild script, there is clearly a bug.
2017-02-20 15:05:00 -06:00
Adam Miller
1813a1a515 Bump RELEASE for automatic rebuild 2017-02-20 15:03:45 -06:00
Adam Miller
4462f08e86 update to latest upstream 2017-02-16 12:20:46 -06:00
4 changed files with 14 additions and 10 deletions

View file

@ -1,16 +1,16 @@
FROM registry.fedoraproject.org/fedora:25
MAINTAINER "Stef Walter" <stefw@redhat.com>
ENV VERSION=125 RELEASE=1.2
ENV VERSION=135 RELEASE=14
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

View file

@ -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

View file

@ -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 "$@"

View file

@ -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