Compare commits

..

1 commit

Author SHA1 Message Date
Clement Verna
4ce4e75b00 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:30:17 +02:00
2 changed files with 17 additions and 19 deletions

View file

@ -1,18 +1,17 @@
FROM registry.fedoraproject.org/fedora:27 FROM registry.fedoraproject.org/fedora:rawhide
ENV VERSION=0 RELEASE=25 ARCH=x86_64 ENV VERSION=0 ARCH=x86_64
LABEL com.redhat.component="docker" \ LABEL com.redhat.component="docker" \
name="$FGC/docker" \ name="docker" \
version="$VERSION" \ version="$VERSION" \
release="$RELEASE.$DISTTAG" \
architecture="$ARCH" \ architecture="$ARCH" \
usage="atomic install --system --system-package=no docker && systemctl start docker" \ usage="atomic install --system --system-package=no docker && systemctl start docker" \
summary="The docker daemon as a system container." \ summary="The docker daemon as a system container." \
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 docker-novolume-plugin lvm2 iptables procps-ng xz oci-register-machine \ 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 \
&& rpm --nofiles -V docker container-storage-setup container-selinux cloud-utils-growpart 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 \
&& 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

View file

@ -5,7 +5,6 @@
"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,
@ -284,17 +283,6 @@
"mode=755" "mode=755"
] ]
}, },
{
"type": "bind",
"source": "/opt",
"destination": "/opt",
"options": [
"rbind",
"rslave",
"rw",
"mode=755"
]
},
{ {
"type": "bind", "type": "bind",
"source": "/mnt", "source": "/mnt",
@ -306,6 +294,17 @@
"mode=755" "mode=755"
] ]
}, },
{
"type": "bind",
"source": "/usr/share/rhel",
"destination": "/usr/share/rhel",
"options": [
"rprivate",
"rbind",
"ro",
"mode=755"
]
},
{ {
"type": "bind", "type": "bind",
"source": "${RUN_DIRECTORY}", "source": "${RUN_DIRECTORY}",
@ -378,11 +377,10 @@
"private" "private"
] ]
} }
$ADDTL_MOUNTS
], ],
"hooks": {}, "hooks": {},
"linux": { "linux": {
"rootfsPropagation": "rslave", "rootfsPropagation": "private",
"resources": { "resources": {
"devices": [ "devices": [
{ {
@ -395,6 +393,7 @@
{ {
"type": "mount" "type": "mount"
} }
] ],
"selinuxProcessLabel": "system_u:system_r:container_runtime_t:s0"
} }
} }