From 6f373888b3e4c5088267ef6c4de6de88cd4639ed Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Fri, 12 Jan 2018 19:59:00 +0000
Subject: [PATCH] all dockerfiles

---
 docker/netdisco-backend/Dockerfile    | 10 +++++++---
 docker/netdisco-base/Dockerfile       |  7 +++----
 docker/netdisco-do/Dockerfile         |  8 ++++++++
 docker/netdisco-postgresql/Dockerfile |  2 +-
 docker/netdisco-web/Dockerfile        |  8 ++++++++
 5 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 docker/netdisco-do/Dockerfile
 create mode 100644 docker/netdisco-web/Dockerfile

diff --git a/docker/netdisco-backend/Dockerfile b/docker/netdisco-backend/Dockerfile
index 2bbe4a0e..bbd5b078 100644
--- a/docker/netdisco-backend/Dockerfile
+++ b/docker/netdisco-backend/Dockerfile
@@ -1,9 +1,13 @@
 # vim: ft=Dockerfile
 FROM netdisco-base:latest
 
-RUN mkdir $NETDISCO_HOME/netdisco-mibs && cd $NETDISCO_HOME/netdisco-mibs && \
-  curl -s https://api.github.com/repos/netdisco/netdisco-mibs/tags | \
+USER netdisco:netdisco
+WORKDIR $NETDISCO_HOME/netdisco-mibs
+RUN curl -s https://api.github.com/repos/netdisco/netdisco-mibs/tags | \
   jq '.[]|.tarball_url|select(test("tarball/\\d+\\.\\d+$"))' | \
   sort -rg | head -n1 | xargs -n1 curl -L | tar --strip-components=1 -zxf -
 
-CMD bash
+WORKDIR $NETDISCO_HOME
+VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
+ENTRYPOINT ["/home/netdisco/bin/netdisco-backend"]
+CMD ["foreground"]
diff --git a/docker/netdisco-base/Dockerfile b/docker/netdisco-base/Dockerfile
index efde01ff..c7d30454 100644
--- a/docker/netdisco-base/Dockerfile
+++ b/docker/netdisco-base/Dockerfile
@@ -5,10 +5,8 @@ RUN bash -c 'mkdir -p /usr/share/man/man{1..8}' && \
     apt-get -yq update && \
     apt-get install -yq --no-install-recommends \
       build-essential \
-      ca-certificates \
       cpanminus \
       curl \
-      daemontools-run \
       git \
       jq \
       libdbd-pg-perl \
@@ -23,7 +21,9 @@ RUN bash -c 'mkdir -p /usr/share/man/man{1..8}' && \
 ENV NETDISCO_HOME "/home/netdisco"
 RUN groupadd -r netdisco -g 901 && \
     useradd -u 901 -r -p x -g netdisco -m -d $NETDISCO_HOME -s /bin/bash -c "netdisco user" netdisco
+
 USER netdisco:netdisco
+WORKDIR $NETDISCO_HOME
 
 RUN curl -s https://api.github.com/repos/netdisco/netdisco/tags | \
   jq '.[]|.name|select(test("^\\d+\\.\\d+$"))|"https://github.com/netdisco/netdisco.git@"+.' | \
@@ -35,5 +35,4 @@ RUN mkdir $NETDISCO_HOME/bin && \
 ENV PATH $NETDISCO_HOME/bin:$PATH
 ENV SHELL "/bin/bash"
 
-WORKDIR $NETDISCO_HOME
-CMD bash
+CMD ["bash"]
diff --git a/docker/netdisco-do/Dockerfile b/docker/netdisco-do/Dockerfile
new file mode 100644
index 00000000..0b159148
--- /dev/null
+++ b/docker/netdisco-do/Dockerfile
@@ -0,0 +1,8 @@
+# vim: ft=Dockerfile
+FROM netdisco-base:latest
+
+USER netdisco:netdisco
+WORKDIR $NETDISCO_HOME
+VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
+ENTRYPOINT ["/home/netdisco/bin/netdisco-do"]
+CMD [""]
diff --git a/docker/netdisco-postgresql/Dockerfile b/docker/netdisco-postgresql/Dockerfile
index b8a7e284..93880067 100644
--- a/docker/netdisco-postgresql/Dockerfile
+++ b/docker/netdisco-postgresql/Dockerfile
@@ -20,6 +20,6 @@ COPY netdisco-db-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/netdisco-db-entrypoint.sh
 
 WORKDIR /
-VOLUME /var/lib/postgresql/data
+VOLUME ["/var/lib/postgresql/data"]
 ENTRYPOINT ["/usr/local/bin/netdisco-db-entrypoint.sh"]
 CMD ["postgres"]
diff --git a/docker/netdisco-web/Dockerfile b/docker/netdisco-web/Dockerfile
new file mode 100644
index 00000000..3ceb9e87
--- /dev/null
+++ b/docker/netdisco-web/Dockerfile
@@ -0,0 +1,8 @@
+# vim: ft=Dockerfile
+FROM netdisco-base:latest
+
+USER netdisco:netdisco
+WORKDIR $NETDISCO_HOME
+VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
+ENTRYPOINT ["/home/netdisco/bin/netdisco-web"]
+CMD ["foreground"]