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

Compare commits

base: container:rawhide
Branches Tags
container:rawhide
container:f29
container:f30
container:main
container:f28
container:f27
container:f26
container:f25
container:f24
..
compare: container:f24
Branches Tags
container:f29
container:f30
container:main
container:rawhide
container:f28
container:f27
container:f26
container:f25
container:f24

12 commits
rawhide ... f24

Author SHA1 Message Date
Adam Miller
38d9d4ad63 bump spec for test build, 2016-12-09 12:42:08 -06:00
Adam Miller
fa89fad94d bump spec for test build, add sleep for debugging 2016-12-09 12:11:19 -06:00
Adam Miller
8d6b83a243 bump spec for test build 2016-12-09 11:55:42 -06:00
Adam Miller
a693bb794f add FGC (Fedora Generational Core) and DISTTAG, bump release for test build 
Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
 2016-12-08 12:30:10 -06:00
Adam Miller
c065150e81 bump spec for test build 2016-10-26 14:45:24 -05:00
Adam Miller
fe543a6bf1 bump release for test build 2016-10-25 09:43:36 -05:00
Adam Miller
425cd6a09c bump release for test build 2016-10-20 10:55:56 -05:00
Adam Miller
4e57fac32d bump Release for testing 2016-10-17 13:15:26 -05:00
Cockpit Project
3a98e45b25 Add package name suffix 
When supplying version and release of the cockpit-ws package to dnf,
it can't find the right package without also stating the suffix,
e.g. '.fc24'.
 2016-09-29 21:37:02 +00:00
Cockpit Project
99b1e11ca1 Bump version and rebuild 2016-09-26 19:44:58 +00:00
Cockpit Project
04f548129d Bump version and rebuild 2016-09-26 19:37:35 +00:00
Cockpit Project
efe3d66269 Ensure correct version of cockpit-ws is installed 2016-09-26 19:37:02 +00:00
4 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Dockerfile
View file

@ -1,28 +1,29 @@
FROM registry.fedoraproject.org/fedora:rawhide
MAINTAINER "Stef Walter" <stefw@redhat.com>
FROM fedora:24
MAINTAINER "Adam Miller" <maxamillion@fedoraproject.org>
ENV VERSION=181
ENV NAME=cockpit VERSION=0.117 RELEASE=1.8
LABEL BZComponent="cockpit" \
Name="$FGC/cockpit" \
Version="$VERSION" \
Architecture="x86_64"
Name="$FGC/$NAME" \
Version="$VERSION" \
Release="$RELEASE.$DISTTAG" \
Architecture="x86_64"
RUN dnf install -y $NAME
RUN dnf install -y cockpit-ws cockpit-dashboard cockpit-bridge && \
mkdir -p /container && ln -s /host/proc/1 /container/target-namespace && \
dnf clean all
# 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 /container/atomic-uninstall /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 --rm --privileged -v /:/host IMAGE /container/atomic-install
LABEL UNINSTALL /usr/bin/docker run --rm --privileged -v /:/host IMAGE /container/atomic-uninstall
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

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-system and other resources must be installed in the host" >&2
echo "cockpit-run: cockpit-shell and other resources must be installed in the host" >&2
exit 1
fi
if [ -f /host/usr/libexec/cockpit-ws ]; then
@ -34,17 +34,14 @@ 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 /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/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/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,7 +15,6 @@ 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-system and other resources must be installed in the host" >&2
echo "cockpit-shell and other resources must be installed in the host" >&2
exit 1
fi
if [ -f /host/usr/libexec/cockpit-ws ]; then