From a324c22e3ca1c43445fbb13f08679518d529420b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= Date: Tue, 23 Jun 2015 22:45:43 +0200 Subject: [PATCH 1/4] distro specific readme MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren --- distros/README.md | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 distros/README.md diff --git a/distros/README.md b/distros/README.md new file mode 100644 index 0000000..8d9f5e3 --- /dev/null +++ b/distros/README.md @@ -0,0 +1,35 @@ +# Distribution specific Dockerfiles + +## Requirements + +### Keep your images up-to-date +Use the distribution package manager to keep your image up-to-date. + +### REPOSITORY +Add a `REPOSITORY` comment with the URL to your GitHub repository where the Dockerfile is present. +`# REPOSITORY ` + +### MAINTAINER +Add the `MAINTAINER` instruction and your contact details, GitHub aliases are acceptable. + +## Example Dockerfile + +```sh +# REPOSITORY https://github.com/docker/docker-bench-security + +MAINTAINER dockerbench.com + +FROM alpine:3.1 + +RUN apk update && \ + apk upgrade && \ + apk --update add docker + +RUN mkdir /docker-bench-security + +COPY . /docker-bench-security + +WORKDIR /docker-bench-security + +ENTRYPOINT ["/bin/sh", "docker-bench-security.sh"] +``` From 2a9d8a0da746cc0761c7b0d71427aa6d88f3befe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= Date: Tue, 23 Jun 2015 22:46:03 +0200 Subject: [PATCH 2/4] distro specific example MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren --- distros/Dockerfile.alpine | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 distros/Dockerfile.alpine diff --git a/distros/Dockerfile.alpine b/distros/Dockerfile.alpine new file mode 100644 index 0000000..76260c6 --- /dev/null +++ b/distros/Dockerfile.alpine @@ -0,0 +1,17 @@ +# REPOSITORY https://github.com/docker/docker-bench-security + +MAINTAINER dockerbench.com + +FROM alpine:3.1 + +RUN apk update && \ + apk upgrade && \ + apk --update add docker + +RUN mkdir /docker-bench-security + +COPY . /docker-bench-security + +WORKDIR /docker-bench-security + +ENTRYPOINT ["/bin/sh", "docker-bench-security.sh"] From e2cd15bf52c64809fd3d7e2209a13ab7cf446286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= Date: Tue, 23 Jun 2015 22:48:37 +0200 Subject: [PATCH 3/4] Dockerfile name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren --- distros/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/distros/README.md b/distros/README.md index 8d9f5e3..7414672 100644 --- a/distros/README.md +++ b/distros/README.md @@ -2,6 +2,9 @@ ## Requirements +### Dockerfile name +The format should be `Dockerfile.{distribution name}`. + ### Keep your images up-to-date Use the distribution package manager to keep your image up-to-date. From 7afc408e49fd72a434e1be82521bf78221381ce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= Date: Fri, 26 Jun 2015 02:18:56 +0200 Subject: [PATCH 4/4] remove Dockerfile from readme MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren --- distros/README.md | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/distros/README.md b/distros/README.md index 7414672..a5686e1 100644 --- a/distros/README.md +++ b/distros/README.md @@ -15,24 +15,4 @@ Add a `REPOSITORY` comment with the URL to your GitHub repository where the Dock ### MAINTAINER Add the `MAINTAINER` instruction and your contact details, GitHub aliases are acceptable. -## Example Dockerfile - -```sh -# REPOSITORY https://github.com/docker/docker-bench-security - -MAINTAINER dockerbench.com - -FROM alpine:3.1 - -RUN apk update && \ - apk upgrade && \ - apk --update add docker - -RUN mkdir /docker-bench-security - -COPY . /docker-bench-security - -WORKDIR /docker-bench-security - -ENTRYPOINT ["/bin/sh", "docker-bench-security.sh"] -``` +For an example Dockerfile, please refer to `Dockerfile.alpine`.