diff --git a/Dockerfile b/Dockerfile index 63562e2ea..3f95d48fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,18 @@ -FROM python:2.7-wheezy +FROM python:2.7.12-wheezy WORKDIR /opt/netbox +ENTRYPOINT [ "/docker-entrypoint.sh" ] +VOLUME ["/etc/netbox-nginx/"] -ARG BRANCH=master -ARG URL=https://github.com/digitalocean/netbox.git -RUN git clone --depth 1 $URL -b $BRANCH . && \ - apt-get update -qq && apt-get install -y libldap2-dev libsasl2-dev libssl-dev && \ - pip install gunicorn==17.5 && \ - pip install django-auth-ldap && \ +COPY requirements.txt /opt/netbox/requirements.txt +RUN apt-get update -qq && apt-get install -y libldap2-dev libsasl2-dev libssl-dev && \ + pip install gunicorn==17.5 && \ + pip install django-auth-ldap && \ pip install -r requirements.txt -ADD docker/docker-entrypoint.sh /docker-entrypoint.sh -ADD netbox/netbox/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py +COPY docker/docker-entrypoint.sh /docker-entrypoint.sh +COPY docker/nginx.conf /etc/netbox-nginx/ -ENTRYPOINT [ "/docker-entrypoint.sh" ] - -ADD docker/gunicorn_config.py /opt/netbox/ -ADD docker/nginx.conf /etc/netbox-nginx/ -VOLUME ["/etc/netbox-nginx/"] +COPY . /opt/netbox +COPY netbox/netbox/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py +COPY docker/gunicorn_config.py /opt/netbox/ diff --git a/Dockerfile.jessie b/Dockerfile.jessie new file mode 100644 index 000000000..ea37fba1b --- /dev/null +++ b/Dockerfile.jessie @@ -0,0 +1,18 @@ +FROM python:2.7.12 + +WORKDIR /opt/netbox +ENTRYPOINT [ "/docker-entrypoint.sh" ] +VOLUME ["/etc/netbox-nginx/"] + +COPY requirements.txt /opt/netbox/requirements.txt +RUN apt-get update -qq && apt-get install -y libldap2-dev libsasl2-dev libssl-dev && \ + pip install gunicorn==17.5 && \ + pip install django-auth-ldap && \ + pip install -r requirements.txt + +COPY docker/docker-entrypoint.sh /docker-entrypoint.sh +COPY docker/nginx.conf /etc/netbox-nginx/ + +COPY . /opt/netbox +COPY netbox/netbox/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py +COPY docker/gunicorn_config.py /opt/netbox/ diff --git a/docker-compose.jessie.yml b/docker-compose.jessie.yml new file mode 100644 index 000000000..8a19619e5 --- /dev/null +++ b/docker-compose.jessie.yml @@ -0,0 +1,8 @@ +version: '2' + +services: + netbox: + build: + context: . + dockerfile: Dockerfile.jessie + image: digitalocean/netbox:jessie