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

reference docker images at docker.io

Browse Source
This commit is contained in:
Oliver Gorwits
2018-01-12 21:01:01 +00:00
parent 6f373888b3
commit ebaf3b8603
8 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -14,3 +14,4 @@ Build
_build _build
blib blib
docker/netdisco docker/netdisco
!docker/netdisco-*/hooks/*

6
docker/netdisco-backend/Dockerfile
View File

@@ -1,5 +1,8 @@
# vim: ft=Dockerfile # vim: ft=Dockerfile
FROM netdisco-base:latest ARG TAG=master
FROM docker.io/netdisco:${TAG}-base
VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
USER netdisco:netdisco USER netdisco:netdisco
WORKDIR $NETDISCO_HOME/netdisco-mibs WORKDIR $NETDISCO_HOME/netdisco-mibs
@@ -8,6 +11,5 @@ RUN curl -s https://api.github.com/repos/netdisco/netdisco-mibs/tags | \
sort -rg | head -n1 | xargs -n1 curl -L | tar --strip-components=1 -zxf - sort -rg | head -n1 | xargs -n1 curl -L | tar --strip-components=1 -zxf -
WORKDIR $NETDISCO_HOME WORKDIR $NETDISCO_HOME
VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
ENTRYPOINT ["/home/netdisco/bin/netdisco-backend"] ENTRYPOINT ["/home/netdisco/bin/netdisco-backend"]
CMD ["foreground"] CMD ["foreground"]

2
docker/netdisco-backend/hooks/build Executable file
View File

@@ -0,0 +1,2 @@
#!/bin/bash
docker build --build-arg TAG=$SOURCE_BRANCH -t $IMAGE_NAME .

6
docker/netdisco-do/Dockerfile
View File

@@ -1,8 +1,10 @@
# vim: ft=Dockerfile # vim: ft=Dockerfile
FROM netdisco-base:latest ARG TAG=master
FROM docker.io/netdisco:${TAG}-base
VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
USER netdisco:netdisco USER netdisco:netdisco
WORKDIR $NETDISCO_HOME WORKDIR $NETDISCO_HOME
VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
ENTRYPOINT ["/home/netdisco/bin/netdisco-do"] ENTRYPOINT ["/home/netdisco/bin/netdisco-do"]
CMD [""] CMD [""]

2
docker/netdisco-do/hooks/build Executable file
View File

@@ -0,0 +1,2 @@
#!/bin/bash
docker build --build-arg TAG=$SOURCE_BRANCH -t $IMAGE_NAME .

11
docker/netdisco-postgresql/Dockerfile
View File

@@ -6,6 +6,11 @@ RUN apk add --no-cache \
jq \ jq \
tar tar
COPY netdisco-db-entrypoint.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/netdisco-db-entrypoint.sh
RUN PGDATA=/var/lib/postgresql/netdisco-pgdata /usr/local/bin/docker-entrypoint.sh postgres --version
WORKDIR /var/lib/postgresql/netdisco-sql WORKDIR /var/lib/postgresql/netdisco-sql
RUN curl -s https://api.github.com/repos/netdisco/netdisco/tags | \ RUN curl -s https://api.github.com/repos/netdisco/netdisco/tags | \
jq '.[]|.name|select(test("^\\d+\\.\\d+$"))|"https://api.github.com/repos/netdisco/netdisco/tarball/"+.' | \ jq '.[]|.name|select(test("^\\d+\\.\\d+$"))|"https://api.github.com/repos/netdisco/netdisco/tarball/"+.' | \
@@ -14,12 +19,8 @@ RUN curl -s https://api.github.com/repos/netdisco/netdisco/tags | \
curl -sLO "https://raw.githubusercontent.com/netdisco/upstream-sources/master/ieee/oui.sql" && \ curl -sLO "https://raw.githubusercontent.com/netdisco/upstream-sources/master/ieee/oui.sql" && \
curl -sLO "https://raw.githubusercontent.com/netdisco/netdisco/master/lib/App/Netdisco/DB.pm" curl -sLO "https://raw.githubusercontent.com/netdisco/netdisco/master/lib/App/Netdisco/DB.pm"
RUN PGDATA=/var/lib/postgresql/netdisco-pgdata /usr/local/bin/docker-entrypoint.sh postgres --version VOLUME ["/var/lib/postgresql/data"]
COPY netdisco-db-entrypoint.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/netdisco-db-entrypoint.sh
WORKDIR / WORKDIR /
VOLUME ["/var/lib/postgresql/data"]
ENTRYPOINT ["/usr/local/bin/netdisco-db-entrypoint.sh"] ENTRYPOINT ["/usr/local/bin/netdisco-db-entrypoint.sh"]
CMD ["postgres"] CMD ["postgres"]

7
docker/netdisco-web/Dockerfile
View File

@@ -1,8 +1,11 @@
# vim: ft=Dockerfile # vim: ft=Dockerfile
FROM netdisco-base:latest ARG TAG=master
FROM docker.io/netdisco:${TAG}-base
EXPOSE 5000
VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
USER netdisco:netdisco USER netdisco:netdisco
WORKDIR $NETDISCO_HOME WORKDIR $NETDISCO_HOME
VOLUME ["/home/netdisco/environments", "/home/netdisco/nd-site-local"]
ENTRYPOINT ["/home/netdisco/bin/netdisco-web"] ENTRYPOINT ["/home/netdisco/bin/netdisco-web"]
CMD ["foreground"] CMD ["foreground"]

2
docker/netdisco-web/hooks/build Executable file
View File

@@ -0,0 +1,2 @@
#!/bin/bash
docker build --build-arg TAG=$SOURCE_BRANCH -t $IMAGE_NAME .