matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "Conform with new Docker build method"" (#264)

Browse Source
This commit is contained in:
Joe LeVeque 2017-02-06 08:40:57 -08:00 committed by GitHub
parent 8826beb597
commit 12fa107645
3 changed files with 45 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dockers/docker-dhcp-relay/Dockerfile
View File

@ -1,25 +0,0 @@
FROM docker-base
## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive
# Update APT package lists
RUN apt-get update
# Dependencies for sonic-cfggen
RUN apt-get -y install python-lxml python-jinja2 python-netaddr python-ipaddr python-yaml
## Install isc-dhcp-relay and clean up afterward
RUN apt-get -y install isc-dhcp-relay \
&& apt-get clean -y \
&& apt-get autoclean -y \
&& apt-get autoremove -y
COPY ["isc-dhcp-relay.j2", "/usr/share/dhcp-relay/"]
COPY ["config.sh", "/usr/bin/"]
ENTRYPOINT /usr/bin/config.sh \
&& service rsyslog start \
&& service isc-dhcp-relay start \
&& /bin/bash

37
dockers/docker-dhcp-relay/Dockerfile.j2 Normal file
View File

@ -0,0 +1,37 @@
FROM docker-base
## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive
## Update APT package lists
RUN apt-get update
## Dependencies for sonic-cfggen
RUN apt-get -y install python-lxml python-jinja2 python-netaddr python-ipaddr python-yaml
COPY \
{% for deb in docker_dhcp_relay_debs.split(' ') -%}
debs/{{ deb }}{{' '}}
{%- endfor -%}
debs/
RUN dpkg -i \
{% for deb in docker_dhcp_relay_debs.split(' ') -%}
debs/{{ deb }}{{' '}}
{%- endfor %}
## Install isc-dhcp-relay Debian package
RUN apt-get -y install isc-dhcp-relay
## Clean up
RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
RUN rm -rf /debs
COPY ["isc-dhcp-relay.j2", "/usr/share/dhcp-relay/"]
COPY ["config.sh", "/usr/bin/"]
ENTRYPOINT /usr/bin/config.sh \
&& service rsyslog start \
&& service isc-dhcp-relay start \
&& /bin/bash

10
rules/docker-dhcp-relay.mk
View File

@ -1,7 +1,13 @@
# docker dhcp relay image # Docker image for DHCP relay
DOCKER_DHCP_RELAY = docker-dhcp-relay.gz DOCKER_DHCP_RELAY = docker-dhcp-relay.gz
$(DOCKER_DHCP_RELAY)_PATH = $(DOCKERS_PATH)/docker-dhcp-relay $(DOCKER_DHCP_RELAY)_PATH = $(DOCKERS_PATH)/docker-dhcp-relay
$(DOCKER_DHCP_RELAY)_DEPENDS += $(SONIC_CONFIG_ENGINE)
$(DOCKER_DHCP_RELAY)_LOAD_DOCKERS = $(DOCKER_BASE) $(DOCKER_DHCP_RELAY)_LOAD_DOCKERS = $(DOCKER_BASE)
SONIC_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY)
SONIC_SIMPLE_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY)
$(DOCKER_DHCP_RELAY)_CONTAINER_NAME = dhcp_relay
$(DOCKER_DHCP_RELAY)_RUN_OPT += --net=host --privileged -t
$(DOCKER_DHCP_RELAY)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro