Compare commits
28 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c60c7a925d | ||
|
|
102977e928 | ||
|
|
cec213c3df | ||
|
|
e05d461522 | ||
|
|
2cb99328e5 | ||
|
|
5d721490b7 | ||
|
|
40e9d2f2af | ||
|
|
8c9bc87186 | ||
|
|
09ede7dbc9 | ||
|
|
842c07df56 |
||
|
|
243efc7f01 |
||
|
|
8c4d7739b7 | ||
|
|
ab83dba6a7 | ||
|
|
8c19646e57 | ||
|
|
c633356712 | ||
|
|
5049c2276e | ||
|
|
33e1fd0eab | ||
|
|
59a8fd5c22 | ||
|
|
7b18d67002 | ||
|
|
14be0b1dbb | ||
|
|
88d7580e2a | ||
|
|
de198342c8 | ||
|
|
02cefe15a5 | ||
|
|
23a0ad1475 | ||
|
|
aa11bcd9ad | ||
|
|
e2e60fe792 | ||
|
|
9fc2ae3b02 |
||
|
|
b2569cfbd5 |
2 changed files with 18 additions and 17 deletions
10
Dockerfile
10
Dockerfile
|
|
@ -1,8 +1,8 @@
|
|||
FROM registry.fedoraproject.org/fedora:rawhide
|
||||
FROM registry.fedoraproject.org/fedora:27
|
||||
|
||||
ENV VERSION=0 RELEASE=1 ARCH=x86_64
|
||||
ENV VERSION=0 RELEASE=25 ARCH=x86_64
|
||||
LABEL com.redhat.component="docker" \
|
||||
name="docker" \
|
||||
name="$FGC/docker" \
|
||||
version="$VERSION" \
|
||||
release="$RELEASE.$DISTTAG" \
|
||||
architecture="$ARCH" \
|
||||
|
|
@ -11,8 +11,8 @@ LABEL com.redhat.component="docker" \
|
|||
maintainer="Giuseppe Scrivano <gscrivan@redhat.com>" \
|
||||
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 \
|
||||
&& 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 \
|
||||
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 \
|
||||
&& rpm --nofiles -V docker container-storage-setup container-selinux cloud-utils-growpart docker-novolume-plugin lvm2 iptables procps-ng xz oci-register-machine \
|
||||
&& mkdir -p /usr/lib/modules && dnf clean all
|
||||
|
||||
RUN ln -s /usr/libexec/docker/docker-runc-current /usr/bin/docker-runc
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
"arch": "amd64"
|
||||
},
|
||||
"process": {
|
||||
"selinuxLabel": "system_u:system_r:container_runtime_t:s0",
|
||||
"terminal": false,
|
||||
"user": {
|
||||
"uid": 0,
|
||||
|
|
@ -283,6 +284,17 @@
|
|||
"mode=755"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bind",
|
||||
"source": "/opt",
|
||||
"destination": "/opt",
|
||||
"options": [
|
||||
"rbind",
|
||||
"rslave",
|
||||
"rw",
|
||||
"mode=755"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bind",
|
||||
"source": "/mnt",
|
||||
|
|
@ -294,17 +306,6 @@
|
|||
"mode=755"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bind",
|
||||
"source": "/usr/share/rhel",
|
||||
"destination": "/usr/share/rhel",
|
||||
"options": [
|
||||
"rprivate",
|
||||
"rbind",
|
||||
"ro",
|
||||
"mode=755"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bind",
|
||||
"source": "${RUN_DIRECTORY}",
|
||||
|
|
@ -377,10 +378,11 @@
|
|||
"private"
|
||||
]
|
||||
}
|
||||
$ADDTL_MOUNTS
|
||||
],
|
||||
"hooks": {},
|
||||
"linux": {
|
||||
"rootfsPropagation": "private",
|
||||
"rootfsPropagation": "rslave",
|
||||
"resources": {
|
||||
"devices": [
|
||||
{
|
||||
|
|
@ -393,7 +395,6 @@
|
|||
{
|
||||
"type": "mount"
|
||||
}
|
||||
],
|
||||
"selinuxProcessLabel": "system_u:system_r:container_runtime_t:s0"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue