Compare commits
25 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c3292770fe | ||
|
|
d614930e17 | ||
|
|
ab68f90d78 | ||
|
|
c52b839664 | ||
|
|
e9ce6df120 | ||
|
|
a6e92b8211 | ||
|
|
8a91912287 | ||
|
|
5572bed79c | ||
|
|
7ccefbae28 | ||
|
|
0bc5617339 | ||
|
|
71639ff52a | ||
|
|
71ea0c6bf5 | ||
|
|
c065d39da7 | ||
|
|
588879a862 | ||
|
|
39483bd840 | ||
|
|
fc8c2e6cc2 | ||
|
|
7aa15b4a08 | ||
|
|
59ee950540 | ||
|
|
5a89b2f994 | ||
|
|
4e5d38dcc5 | ||
|
|
2d722e3a29 | ||
|
|
35686f795b | ||
|
|
eba037c974 | ||
|
|
1813a1a515 | ||
|
|
4462f08e86 |
4 changed files with 14 additions and 10 deletions
10
Dockerfile
10
Dockerfile
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 "$@"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue