container/cockpit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

merge into: container:f26
Branches Tags
container:rawhide
container:f29
container:f30
container:main
container:f28
container:f27
container:f26
container:f25
container:f24
...
pull from: container:rawhide
Branches Tags
container:f29
container:f30
container:main
container:rawhide
container:f28
container:f27
container:f26
container:f25
container:f24
Sign in to create a new pull request.

6 commits
f26 ... rawhide

Author SHA1 Message Date
Martin Pitt
f8b02a730c Update for Cockpit 181 2018-11-08 21:46:39 +01:00
Martin Pitt
57b1ac75e0 Update for Cockpit 176 2018-09-03 11:44:22 +02:00
Clement Verna
62c6ef4f94 Use the rawhide tag for the master branch 
Signed-off-by: Clement Verna <cverna@tutanota.com>
 2018-08-20 17:17:28 +02:00
Clement Verna
b28310fccb 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 <cverna@tutanota.com>
 2018-08-20 17:08:30 +02:00
Martin Pitt
8f01b0e193 Update for cockpit 166 and Fedora 29 2018-05-02 19:14:15 +02:00
petervo
47960ad041 Update for cockpit 135 2017-03-23 15:06:01 -07:00
4 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Dockerfile
View file

@ -1,29 +1,28 @@
FROM registry.fedoraproject.org/fedora:26
FROM registry.fedoraproject.org/fedora:rawhide
MAINTAINER "Stef Walter" <stefw@redhat.com>
ENV VERSION=125 RELEASE=1.6
ENV VERSION=181
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
RUN dnf install -y cockpit-ws cockpit-dashboard cockpit-bridge && \
mkdir -p /container && ln -s /host/proc/1 /container/target-namespace && \
dnf clean all
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
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

11
atomic-install
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

1
atomic-run
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 "$@"

2
atomic-uninstall
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