135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move common parts to netdisco-base

Browse Source
This commit is contained in:
Oliver Gorwits
2018-01-13 08:52:33 +00:00
parent c7b2b7be05
commit 3918913b18
4 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docker/netdisco-backend/Dockerfile
View File

@@ -5,9 +5,6 @@ FROM docker.io/netdisco/netdisco:${TAG}-base
LABEL org.netdisco.maintainer="The Netdisco Project" LABEL org.netdisco.maintainer="The Netdisco Project"
LABEL org.netdisco.version=${TAG} LABEL org.netdisco.version=${TAG}
VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
USER netdisco:netdisco
WORKDIR $NETDISCO_HOME/netdisco-mibs WORKDIR $NETDISCO_HOME/netdisco-mibs
RUN curl -s https://api.github.com/repos/netdisco/netdisco-mibs/tags | \ RUN curl -s https://api.github.com/repos/netdisco/netdisco-mibs/tags | \
jq '.[]|.tarball_url|select(test("tarball/\\d+\\.\\d+$"))' | \ jq '.[]|.tarball_url|select(test("tarball/\\d+\\.\\d+$"))' | \

3
docker/netdisco-base/Dockerfile
View File

@@ -39,4 +39,7 @@ RUN mkdir $NETDISCO_HOME/bin && \
ENV PATH $NETDISCO_HOME/bin:$PATH ENV PATH $NETDISCO_HOME/bin:$PATH
ENV SHELL "/bin/bash" ENV SHELL "/bin/bash"
VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
USER netdisco:netdisco
WORKDIR $NETDISCO_HOME
CMD ["bash"] CMD ["bash"]

4
docker/netdisco-do/Dockerfile
View File

@@ -5,9 +5,5 @@ FROM docker.io/netdisco/netdisco:${TAG}-base
LABEL org.netdisco.maintainer="The Netdisco Project" LABEL org.netdisco.maintainer="The Netdisco Project"
LABEL org.netdisco.version=${TAG} 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"] ENTRYPOINT ["/home/netdisco/bin/netdisco-do"]
CMD [""] CMD [""]

4
docker/netdisco-web/Dockerfile
View File

@@ -6,9 +6,5 @@ LABEL org.netdisco.maintainer="The Netdisco Project"
LABEL org.netdisco.version=${TAG} LABEL org.netdisco.version=${TAG}
EXPOSE 5000 EXPOSE 5000
VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
USER netdisco:netdisco
WORKDIR $NETDISCO_HOME
ENTRYPOINT ["/home/netdisco/bin/netdisco-web"] ENTRYPOINT ["/home/netdisco/bin/netdisco-web"]
CMD ["foreground"] CMD ["foreground"]