From 4d26547d78bffda596ec664f642322ae670258cd Mon Sep 17 00:00:00 2001 From: BrandonRoyal Date: Fri, 21 Jul 2017 15:58:27 -0700 Subject: [PATCH] adding ubuntu 16.04.2 detectives and provisioners --- .gitignore | 2 ++ Makefile | 6 ++++++ detectives/init.ubuntu16.04.2.df | 6 ++++++ detectives/os.ubuntu16.04.2.df | 6 ++++++ provisioners/init.ubuntu16.04.2.df | 9 +++++++++ provisioners/init.ubuntu16.04.2/Dockerfile | 3 +++ provisioners/os.ubuntu16.04.2.df | 9 +++++++++ provisioners/os.ubuntu16.04.2/Dockerfile | 1 + 8 files changed, 42 insertions(+) create mode 100644 detectives/init.ubuntu16.04.2.df create mode 100644 detectives/os.ubuntu16.04.2.df create mode 100644 provisioners/init.ubuntu16.04.2.df create mode 100644 provisioners/init.ubuntu16.04.2/Dockerfile create mode 100644 provisioners/os.ubuntu16.04.2.df create mode 100644 provisioners/os.ubuntu16.04.2/Dockerfile diff --git a/.gitignore b/.gitignore index 0b7dc7c..acb9256 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ bin/ .envfile v2c + +.vscode/ \ No newline at end of file diff --git a/Makefile b/Makefile index 2ac9eba..45b030b 100644 --- a/Makefile +++ b/Makefile @@ -101,6 +101,9 @@ builtin-prep: @docker build -t v2c/ubuntu-detective:v16.04.1 -f ./detectives/os.ubuntu16.04.1.df ./detectives/ @docker build -t v2c/ubuntu-provisioner:v16.04.1 -f ./provisioners/os.ubuntu16.04.1.df ./provisioners/ + @docker build -t v2c/ubuntu-detective:v16.04.2 -f ./detectives/os.ubuntu16.04.2.df ./detectives/ + @docker build -t v2c/ubuntu-provisioner:v16.04.2 -f ./provisioners/os.ubuntu16.04.2.df ./provisioners/ + @docker build -t v2c/ubuntu-detective:v16.10 -f ./detectives/os.ubuntu16.10.df ./detectives/ @docker build -t v2c/ubuntu-provisioner:v16.10 -f ./provisioners/os.ubuntu16.10.df ./provisioners/ @@ -128,6 +131,9 @@ builtin-prep: @docker build -t v2c/runit-detective:ubuntu-v16.04.1 -f ./detectives/init.ubuntu16.04.1.df ./detectives/ @docker build -t v2c/runit-provisioner:ubuntu-v16.04.1 -f ./provisioners/init.ubuntu16.04.1.df ./provisioners/ + @docker build -t v2c/runit-detective:ubuntu-v16.04.2 -f ./detectives/init.ubuntu16.04.2.df ./detectives/ + @docker build -t v2c/runit-provisioner:ubuntu-v16.04.2 -f ./provisioners/init.ubuntu16.04.2.df ./provisioners/ + @docker build -t v2c/runit-detective:ubuntu-v16.10 -f ./detectives/init.ubuntu16.10.df ./detectives/ @docker build -t v2c/runit-provisioner:ubuntu-v16.10 -f ./provisioners/init.ubuntu16.10.df ./provisioners/ diff --git a/detectives/init.ubuntu16.04.2.df b/detectives/init.ubuntu16.04.2.df new file mode 100644 index 0000000..9467f39 --- /dev/null +++ b/detectives/init.ubuntu16.04.2.df @@ -0,0 +1,6 @@ +FROM alpine:3.4 +LABEL com.docker.v2c.component=detective \ + com.docker.v2c.component.category=init \ + com.docker.v2c.component.builtin=1 \ + com.docker.v2c.component.rel=v2c/runit-provisioner:ubuntu-v16.04.2 +CMD grep "PRETTY_NAME=\"Ubuntu 16.04.2 LTS\"" /v2c/disk/etc/os-release 1>2 2>/dev/null diff --git a/detectives/os.ubuntu16.04.2.df b/detectives/os.ubuntu16.04.2.df new file mode 100644 index 0000000..e051716 --- /dev/null +++ b/detectives/os.ubuntu16.04.2.df @@ -0,0 +1,6 @@ +FROM alpine:3.4 +LABEL com.docker.v2c.component=detective \ + com.docker.v2c.component.category=os \ + com.docker.v2c.component.builtin=1 \ + com.docker.v2c.component.rel=v2c/ubuntu-provisioner:v16.04.2 +CMD grep "PRETTY_NAME=\"Ubuntu 16.04.2 LTS\"" /v2c/disk/etc/os-release 1>2 2>/dev/null diff --git a/provisioners/init.ubuntu16.04.2.df b/provisioners/init.ubuntu16.04.2.df new file mode 100644 index 0000000..18408e9 --- /dev/null +++ b/provisioners/init.ubuntu16.04.2.df @@ -0,0 +1,9 @@ +FROM alpine:3.4 +LABEL com.docker.v2c.component=provisioner \ + com.docker.v2c.component.category=init \ + com.docker.v2c.component.builtin=1 \ + com.docker.v2c.component.description=provisions\ ubuntu\ 16.04.2\ images +COPY ./init.ubuntu16.04.2/Dockerfile /Dockerfile +RUN tar cf payload.tar Dockerfile +ENTRYPOINT ["/bin/sh"] +CMD ["-c", "cat /payload.tar"] diff --git a/provisioners/init.ubuntu16.04.2/Dockerfile b/provisioners/init.ubuntu16.04.2/Dockerfile new file mode 100644 index 0000000..216a527 --- /dev/null +++ b/provisioners/init.ubuntu16.04.2/Dockerfile @@ -0,0 +1,3 @@ +RUN apt-get update && apt-get install -y runit +ENTRYPOINT ["runsvdir","-P","/etc/service"] +STOPSIGNAL SIGHUP diff --git a/provisioners/os.ubuntu16.04.2.df b/provisioners/os.ubuntu16.04.2.df new file mode 100644 index 0000000..0e08b23 --- /dev/null +++ b/provisioners/os.ubuntu16.04.2.df @@ -0,0 +1,9 @@ +FROM alpine:3.4 +LABEL com.docker.v2c.component=provisioner \ + com.docker.v2c.component.category=os \ + com.docker.v2c.component.builtin=1 \ + com.docker.v2c.component.description=provisions\ ubuntu\ 16.04.2\ images +COPY ./os.ubuntu16.04.2/Dockerfile /Dockerfile +RUN tar cf payload.tar Dockerfile +ENTRYPOINT ["/bin/sh"] +CMD ["-c", "cat /payload.tar"] diff --git a/provisioners/os.ubuntu16.04.2/Dockerfile b/provisioners/os.ubuntu16.04.2/Dockerfile new file mode 100644 index 0000000..53433af --- /dev/null +++ b/provisioners/os.ubuntu16.04.2/Dockerfile @@ -0,0 +1 @@ +FROM ubuntu:16.04