From 3918913b184b89d089e55033941ec51ac14a2316 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sat, 13 Jan 2018 08:52:33 +0000
Subject: [PATCH] move common parts to netdisco-base

---
 docker/netdisco-backend/Dockerfile | 3 ---
 docker/netdisco-base/Dockerfile    | 3 +++
 docker/netdisco-do/Dockerfile      | 4 ----
 docker/netdisco-web/Dockerfile     | 4 ----
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/docker/netdisco-backend/Dockerfile b/docker/netdisco-backend/Dockerfile
index c7e2177c..3d6d6722 100644
--- a/docker/netdisco-backend/Dockerfile
+++ b/docker/netdisco-backend/Dockerfile
@@ -5,9 +5,6 @@ FROM docker.io/netdisco/netdisco:${TAG}-base
 LABEL org.netdisco.maintainer="The Netdisco Project"
 LABEL org.netdisco.version=${TAG}
 
-VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
-
-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+$"))' | \
diff --git a/docker/netdisco-base/Dockerfile b/docker/netdisco-base/Dockerfile
index 451f42ec..0c6d97b3 100644
--- a/docker/netdisco-base/Dockerfile
+++ b/docker/netdisco-base/Dockerfile
@@ -39,4 +39,7 @@ RUN mkdir $NETDISCO_HOME/bin && \
 ENV PATH $NETDISCO_HOME/bin:$PATH
 ENV SHELL "/bin/bash"
 
+VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
+USER netdisco:netdisco
+WORKDIR $NETDISCO_HOME
 CMD ["bash"]
diff --git a/docker/netdisco-do/Dockerfile b/docker/netdisco-do/Dockerfile
index a52ee0bc..3207b56d 100644
--- a/docker/netdisco-do/Dockerfile
+++ b/docker/netdisco-do/Dockerfile
@@ -5,9 +5,5 @@ FROM docker.io/netdisco/netdisco:${TAG}-base
 LABEL org.netdisco.maintainer="The Netdisco Project"
 LABEL org.netdisco.version=${TAG}
 
-VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
-
-USER netdisco:netdisco
-WORKDIR $NETDISCO_HOME
 ENTRYPOINT ["/home/netdisco/bin/netdisco-do"]
 CMD [""]
diff --git a/docker/netdisco-web/Dockerfile b/docker/netdisco-web/Dockerfile
index a6b1acaa..ecb18082 100644
--- a/docker/netdisco-web/Dockerfile
+++ b/docker/netdisco-web/Dockerfile
@@ -6,9 +6,5 @@ LABEL org.netdisco.maintainer="The Netdisco Project"
 LABEL org.netdisco.version=${TAG}
 
 EXPOSE 5000
-VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
-
-USER netdisco:netdisco
-WORKDIR $NETDISCO_HOME
 ENTRYPOINT ["/home/netdisco/bin/netdisco-web"]
 CMD ["foreground"]