Compare commits

...
Sign in to create a new pull request.

18 commits

Author SHA1 Message Date
Adam Miller
57c61deb5e Bump RELEASE for automatic rebuild 2017-09-21 10:24:03 -05:00
Adam Miller
84420deea6 Bump RELEASE for automatic rebuild 2017-08-24 15:38:15 -05:00
Adam Miller
490759033a Bump RELEASE for automatic rebuild 2017-07-25 12:53:16 -05:00
Adam Miller
eaa1594894 Bump RELEASE for automatic rebuild 2017-07-06 14:04:23 -05:00
Adam Miller
f06469b008 Bump RELEASE for automatic rebuild 2017-06-27 10:45:09 -05:00
Adam Miller
9aa8cdb3ad Bump RELEASE for automatic rebuild 2017-06-14 16:25:05 -05:00
Adam Miller
0773fcf8a6 Bump RELEASE for automatic rebuild 2017-06-08 22:18:36 -05:00
yuqi-zhang
96877a0e6e Update Dockerfile and Config
Update Dockerfile to correspond to new requirements. Update runc
config.json for new version of runc, and bind /etc/resolv.conf
2017-06-06 15:54:58 -04:00
Adam Miller
d4336d049f Bump RELEASE for automatic rebuild 2017-05-23 15:31:42 -05:00
Adam Miller
fd480ea91b Bump RELEASE for automatic rebuild 2017-04-20 21:34:40 -05:00
Adam Miller
42c55bad62 Bump RELEASE for automatic rebuild 2017-03-29 22:39:49 -05:00
Adam Miller
fbde328c00 Bump RELEASE for automatic rebuild 2017-03-29 15:18:28 -05:00
Adam Miller
8f169dd99e Bump RELEASE for automatic rebuild 2017-03-15 17:25:37 -05:00
Adam Miller
246a46a395 Bump RELEASE for automatic rebuild 2017-03-15 16:50:54 -05:00
Adam Miller
28a6d721f8 Bump RELEASE for automatic rebuild 2017-03-02 20:22:19 -06:00
yuqi-zhang
c8b9e32c7d Fix BZComponent and Release labels 2017-02-23 14:15:12 -05:00
yuqi-zhang
fc15d8f472 Bump version 2017-02-23 12:06:57 -05:00
yuqi-zhang
48acbf06da Bump version 2017-02-23 12:02:48 -05:00
2 changed files with 55 additions and 23 deletions

View file

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

View file

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