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

Update dockerfile and runc config

Browse source 
Adds the following updates:

  - change labels to lowercase
  - update config to ociVersion 1.0.0
  - bind resolv.conf
  - update capabilites format
This commit is contained in:
yuqi-zhang 2017-05-10 15:41:51 -04:00
commit cb2e9f716e
2 changed files with 54 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Dockerfile
View file

@ -1,12 +1,12 @@
FROM registry.fedoraproject.org/fedora:26
ENV VERSION=0.1 RELEASE=3 ARCH=x86_64
LABEL BZComponent="etcd" \
Name="$FGC/etcd" \
Version="$VERSION" \
Release="$RELEASE.$DISTTAG" \
Architecture="$ARCH" \
Summary="A key-value store for shared configuration and service discovery." \
ENV VERSION=0.1 RELEASE=4 ARCH=x86_64
LABEL com.redhat.component="etcd" \
name="$FGC/etcd" \
version="$VERSION" \
release="$RELEASE.$DISTTAG" \
architecture="$ARCH" \
summary="A key-value store for shared configuration and service discovery." \
maintainer="Giuseppe Scrivano <gscrivan@redhat.com>"
RUN dnf -y --setopt=tsflags=nodocs install etcd hostname && \

62
config.json.template
View file

@ -1,5 +1,5 @@
{
"ociVersion": "0.3.0",
"ociVersion": "1.0.0",
"platform": {
"os": "linux",
"arch": "amd64"
@ -56,7 +56,41 @@
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
"TERM=xterm"
],
"cwd": "/"
"cwd": "/",
"capabilities": {
"bounding": [
"CAP_AUDIT_WRITE",
"CAP_KILL",
"CAP_NET_BIND_SERVICE"
],
"permitted": [
"CAP_AUDIT_WRITE",
"CAP_KILL",
"CAP_NET_BIND_SERVICE"
],
"inheritable": [
"CAP_AUDIT_WRITE",
"CAP_KILL",
"CAP_NET_BIND_SERVICE"
],
"effective": [
"CAP_AUDIT_WRITE",
"CAP_KILL",
"CAP_NET_BIND_SERVICE"
],
"ambient": [
"CAP_AUDIT_WRITE",
"CAP_KILL",
"CAP_NET_BIND_SERVICE"
]
},
"rlimits": [
{
"type": "RLIMIT_NOFILE",
"hard": 1024,
"soft": 1024
}
]
},
"root": {
"path": "rootfs",
@ -155,21 +189,19 @@
"rw",
"mode=755"
]
}
},
{
"destination": "/etc/resolv.conf",
"type": "bind",
"source": "/etc/resolv.conf",
"options": [
"ro",
"rbind",
"rprivate"
]
}
],
"linux": {
"capabilities": [
"CAP_AUDIT_WRITE",
"CAP_KILL",
"CAP_NET_BIND_SERVICE"
],
"rlimits": [
{
"type": "RLIMIT_NOFILE",
"hard": 1024,
"soft": 1024
}
],
"resources": {
"devices": [
{