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

Compare commits

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

8 commits
rawhide ... f25

Author SHA1 Message Date
Adam Miller
8f9a517b6b Bump RELEASE for automatic rebuild 2017-09-21 10:33:10 -05:00
Adam Miller
c835099d3f Bump RELEASE for automatic rebuild 2017-08-24 15:46:06 -05:00
Adam Miller
e1f49fb44d Bump RELEASE for automatic rebuild 2017-07-25 12:56:38 -05:00
yuqi-zhang
b61c9083df Minor fixes for f25 
Change "name" label to be the correct format, and remove a rhel
plugin.

Signed-off-by: Yu Qi Zhang <jzehrarnyg@gmail.com>
 2017-07-10 10:58:04 -04:00
Giuseppe Scrivano
150b7d4f25 f25: check if oci-umount.conf exists before copying it 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
 2017-07-07 16:34:01 +02:00
Giuseppe Scrivano
4980aeed29 f25: there is no container-storage-setup, drop it 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
 2017-07-07 16:24:09 +02:00
Giuseppe Scrivano
eecdfb94e1 sync with upstream 
- fix some selinux labelling issues

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
 2017-07-07 16:11:02 +02:00
yuqi-zhang
47c808132e Change FROM line for f25 branch 2017-06-13 17:40:00 -04:00
4 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Dockerfile
View file

@ -1,8 +1,8 @@
FROM registry.fedoraproject.org/fedora:rawhide FROM registry.fedoraproject.org/fedora:25
ENV VERSION=0 RELEASE=1 ARCH=x86_64 ENV VERSION=0 RELEASE=8 ARCH=x86_64
LABEL com.redhat.component="docker" \ LABEL com.redhat.component="docker" \
name="docker" \ name="$FGC/docker" \
version="$VERSION" \ version="$VERSION" \
release="$RELEASE.$DISTTAG" \ release="$RELEASE.$DISTTAG" \
architecture="$ARCH" \ architecture="$ARCH" \
@ -11,8 +11,8 @@ LABEL com.redhat.component="docker" \
maintainer="Giuseppe Scrivano <gscrivan@redhat.com>" \ maintainer="Giuseppe Scrivano <gscrivan@redhat.com>" \
atomic.type="system" atomic.type="system"
RUN dnf install --setopt=tsflags=nodocs -y docker container-storage-setup container-selinux cloud-utils-growpart python-docker-py docker-novolume-plugin lvm2 iptables procps-ng xz oci-register-machine \ RUN dnf install --setopt=tsflags=nodocs -y docker container-selinux cloud-utils-growpart python-docker-py docker-novolume-plugin lvm2 iptables procps-ng xz oci-register-machine \
&& rpm -V docker container-storage-setup container-selinux cloud-utils-growpart python-docker-py docker-novolume-plugin lvm2 iptables procps-ng xz oci-register-machine \ && rpm -V docker container-selinux cloud-utils-growpart python-docker-py docker-novolume-plugin lvm2 iptables procps-ng xz oci-register-machine \
&& mkdir -p /usr/lib/modules && dnf clean all && mkdir -p /usr/lib/modules && dnf clean all
RUN ln -s /usr/libexec/docker/docker-runc-current /usr/bin/docker-runc RUN ln -s /usr/libexec/docker/docker-runc-current /usr/bin/docker-runc
@ -25,6 +25,6 @@ COPY set_mounts.sh /
COPY config.json.template service.template tmpfiles.template /exports/ COPY config.json.template service.template tmpfiles.template /exports/
COPY daemon.json /exports/hostfs/etc/docker/container-daemon.json COPY daemon.json /exports/hostfs/etc/docker/container-daemon.json
# https://github.com/rhatdan/oci-umount/issues/2 # https://github.com/rhatdan/oci-umount/issues/2
RUN cp /etc/oci-umount.conf /exports/hostfs/etc RUN (test -e /etc/oci-umount.conf && cp /etc/oci-umount.conf /exports/hostfs/etc) || true
CMD ["/usr/bin/init.sh"] CMD ["/usr/bin/init.sh"]

4
config.json.template
View file

@ -5,6 +5,7 @@
"arch": "amd64" "arch": "amd64"
}, },
"process": { "process": {
"selinuxLabel": "system_u:system_r:container_runtime_t:s0",
"terminal": false, "terminal": false,
"user": { "user": {
"uid": 0, "uid": 0,
@ -393,7 +394,6 @@
{ {
"type": "mount" "type": "mount"
} }
], ]
"selinuxProcessLabel": "system_u:system_r:container_runtime_t:s0"
} }
} }

2
daemon.json
View file

@ -1,6 +1,4 @@
{ {
"authorization-plugins": ["rhel-push-plugin"],
"default-runtime": "oci", "default-runtime": "oci",
"containerd": "/run/containerd.sock", "containerd": "/run/containerd.sock",
"userland-proxy-path": "/usr/libexec/docker/docker-proxy-current", "userland-proxy-path": "/usr/libexec/docker/docker-proxy-current",

7
init.sh
View file

@ -1,5 +1,10 @@
#!/bin/bash #!/bin/bash
# Ensure that new process maintain this SELinux label
PID=$$
LABEL=`tr -d '\000' < /proc/$PID/attr/current`
printf %s $LABEL > /proc/self/attr/exec
source /run/docker-bash-env source /run/docker-bash-env
# set storage first # set storage first
@ -22,7 +27,7 @@ do
sleep 0.1 sleep 0.1
done done
# Run all the installed containers # Run all the installed plugins
mkdir -p /run/docker/plugins/ mkdir -p /run/docker/plugins/
ls -1 /usr/libexec/docker/*plugin | \ ls -1 /usr/libexec/docker/*plugin | \
while read i; while read i;