From 48acbf06dab64debeb7f5e77253dec3f57a7507a Mon Sep 17 00:00:00 2001 From: yuqi-zhang Date: Thu, 23 Feb 2017 12:02:48 -0500 Subject: [PATCH 01/18] Bump version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3c321fd..051798d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM fedora:25 -ENV VERSION=0.1 RELEASE=1 ARCH=x86_64 +ENV VERSION=0.1 RELEASE=2 ARCH=x86_64 LABEL BZComponent="etcd-docker" \ Name="$FGC/etcd" \ Version="$VERSION" \ From fc15d8f472b471971dc93e1c262476b5405e0ae2 Mon Sep 17 00:00:00 2001 From: yuqi-zhang Date: Thu, 23 Feb 2017 12:06:57 -0500 Subject: [PATCH 02/18] Bump version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 051798d..ac64a1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM fedora:25 -ENV VERSION=0.1 RELEASE=2 ARCH=x86_64 +ENV VERSION=0.1 RELEASE=3 ARCH=x86_64 LABEL BZComponent="etcd-docker" \ Name="$FGC/etcd" \ Version="$VERSION" \ From c8b9e32c7d6d0fe282090fdca8ae2fb9dce27141 Mon Sep 17 00:00:00 2001 From: yuqi-zhang Date: Thu, 23 Feb 2017 14:15:12 -0500 Subject: [PATCH 03/18] Fix BZComponent and Release labels --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ac64a1f..af0347f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ FROM fedora:25 -ENV VERSION=0.1 RELEASE=3 ARCH=x86_64 -LABEL BZComponent="etcd-docker" \ +ENV VERSION=0.1 RELEASE=4 ARCH=x86_64 +LABEL BZComponent="etcd" \ Name="$FGC/etcd" \ Version="$VERSION" \ - Release="$RELEASE" \ + Release="$RELEASE.$DISTTAG" \ Architecture="$ARCH" \ Summary="A key-value store for shared configuration and service discovery." \ maintainer="Giuseppe Scrivano " From 28a6d721f83dc6866d3850cb2456b8b45c175f2c Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 2 Mar 2017 20:22:19 -0600 Subject: [PATCH 04/18] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index af0347f..80e16cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM fedora:25 -ENV VERSION=0.1 RELEASE=4 ARCH=x86_64 +ENV VERSION=0.1 RELEASE=5 ARCH=x86_64 LABEL BZComponent="etcd" \ Name="$FGC/etcd" \ Version="$VERSION" \ From 246a46a395388e0d7dc38c1beed46ee4b0fb3129 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 15 Mar 2017 16:50:54 -0500 Subject: [PATCH 05/18] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 80e16cd..4500512 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM fedora:25 -ENV VERSION=0.1 RELEASE=5 ARCH=x86_64 +ENV VERSION=0.1 RELEASE=6 ARCH=x86_64 LABEL BZComponent="etcd" \ Name="$FGC/etcd" \ Version="$VERSION" \ From 8f169dd99eb127c413c72f5652dd68979d2ceb05 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 15 Mar 2017 17:25:37 -0500 Subject: [PATCH 06/18] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4500512..ad88795 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM fedora:25 -ENV VERSION=0.1 RELEASE=6 ARCH=x86_64 +ENV VERSION=0.1 RELEASE=7 ARCH=x86_64 LABEL BZComponent="etcd" \ Name="$FGC/etcd" \ Version="$VERSION" \ From fbde328c0015be7ebab8897e21ae371ae4537dcc Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 29 Mar 2017 15:18:28 -0500 Subject: [PATCH 07/18] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ad88795..12628ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM fedora:25 -ENV VERSION=0.1 RELEASE=7 ARCH=x86_64 +ENV VERSION=0.1 RELEASE=8 ARCH=x86_64 LABEL BZComponent="etcd" \ Name="$FGC/etcd" \ Version="$VERSION" \ From 42c55bad6294e4e756bb411bd96523ace95743cb Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 29 Mar 2017 22:39:49 -0500 Subject: [PATCH 08/18] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 12628ac..2ad139f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM fedora:25 -ENV VERSION=0.1 RELEASE=8 ARCH=x86_64 +ENV VERSION=0.1 RELEASE=9 ARCH=x86_64 LABEL BZComponent="etcd" \ Name="$FGC/etcd" \ Version="$VERSION" \ From fd480ea91bb2cc6eaccffb8aed5a526b0a35c7d5 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 20 Apr 2017 21:34:40 -0500 Subject: [PATCH 09/18] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2ad139f..0e2168d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM fedora:25 -ENV VERSION=0.1 RELEASE=9 ARCH=x86_64 +ENV VERSION=0.1 RELEASE=10 ARCH=x86_64 LABEL BZComponent="etcd" \ Name="$FGC/etcd" \ Version="$VERSION" \ From d4336d049f502cbb266a8830ada1ee4a68042cae Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 23 May 2017 15:31:42 -0500 Subject: [PATCH 10/18] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0e2168d..1794b98 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM fedora:25 -ENV VERSION=0.1 RELEASE=10 ARCH=x86_64 +ENV VERSION=0.1 RELEASE=11 ARCH=x86_64 LABEL BZComponent="etcd" \ Name="$FGC/etcd" \ Version="$VERSION" \ From 96877a0e6e41d20c81f4a5bed513384316f2e0fa Mon Sep 17 00:00:00 2001 From: yuqi-zhang Date: Tue, 6 Jun 2017 15:54:58 -0400 Subject: [PATCH 11/18] 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 --- Dockerfile | 16 ++++++------ config.json.template | 62 +++++++++++++++++++++++++++++++++----------- 2 files changed, 55 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1794b98..ff0b142 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ -FROM fedora:25 +FROM registry.fedoraproject.org/fedora:25 -ENV VERSION=0.1 RELEASE=11 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=12 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 " RUN dnf -y --setopt=tsflags=nodocs install etcd hostname && \ diff --git a/config.json.template b/config.json.template index 7fd0657..73cfa73 100644 --- a/config.json.template +++ b/config.json.template @@ -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": [ { From 0773fcf8a634ca20c62cfec1d4f5f951a982dbea Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 8 Jun 2017 22:18:36 -0500 Subject: [PATCH 12/18] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ff0b142..af3635e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:25 -ENV VERSION=0.1 RELEASE=12 ARCH=x86_64 +ENV VERSION=0.1 RELEASE=13 ARCH=x86_64 LABEL com.redhat.component="etcd" \ name="$FGC/etcd" \ version="$VERSION" \ From 9aa8cdb3ad7f410bbf936e93f7c5a5abb1395763 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 14 Jun 2017 16:25:05 -0500 Subject: [PATCH 13/18] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index af3635e..5050512 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:25 -ENV VERSION=0.1 RELEASE=13 ARCH=x86_64 +ENV VERSION=0.1 RELEASE=14 ARCH=x86_64 LABEL com.redhat.component="etcd" \ name="$FGC/etcd" \ version="$VERSION" \ From f06469b008b67cfa24e696ce2e7c17f164645462 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 27 Jun 2017 10:45:09 -0500 Subject: [PATCH 14/18] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5050512..10e2d0b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:25 -ENV VERSION=0.1 RELEASE=14 ARCH=x86_64 +ENV VERSION=0.1 RELEASE=15 ARCH=x86_64 LABEL com.redhat.component="etcd" \ name="$FGC/etcd" \ version="$VERSION" \ From eaa1594894ad67303874c8eee91284b334762f6e Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 6 Jul 2017 14:04:23 -0500 Subject: [PATCH 15/18] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 10e2d0b..df1fb6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:25 -ENV VERSION=0.1 RELEASE=15 ARCH=x86_64 +ENV VERSION=0.1 RELEASE=16 ARCH=x86_64 LABEL com.redhat.component="etcd" \ name="$FGC/etcd" \ version="$VERSION" \ From 490759033a4f532ca9122ee37d6309f51e908fe0 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 25 Jul 2017 12:53:16 -0500 Subject: [PATCH 16/18] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index df1fb6e..ce31b2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:25 -ENV VERSION=0.1 RELEASE=16 ARCH=x86_64 +ENV VERSION=0.1 RELEASE=17 ARCH=x86_64 LABEL com.redhat.component="etcd" \ name="$FGC/etcd" \ version="$VERSION" \ From 84420deea6815f233288c46effbda0065a060040 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 24 Aug 2017 15:38:15 -0500 Subject: [PATCH 17/18] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ce31b2d..24311fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:25 -ENV VERSION=0.1 RELEASE=17 ARCH=x86_64 +ENV VERSION=0.1 RELEASE=18 ARCH=x86_64 LABEL com.redhat.component="etcd" \ name="$FGC/etcd" \ version="$VERSION" \ From 57c61deb5ebb1ed4bf2a19527e2c400f9176004d Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 21 Sep 2017 10:24:03 -0500 Subject: [PATCH 18/18] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 24311fa..56026fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.fedoraproject.org/fedora:25 -ENV VERSION=0.1 RELEASE=18 ARCH=x86_64 +ENV VERSION=0.1 RELEASE=19 ARCH=x86_64 LABEL com.redhat.component="etcd" \ name="$FGC/etcd" \ version="$VERSION" \