-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Revert "Conform with new Docker build method"" (#264)
- Loading branch information
Showing
3 changed files
with
45 additions
and
27 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,13 @@ | ||
# docker dhcp relay image | ||
# Docker image for DHCP relay | ||
|
||
DOCKER_DHCP_RELAY = docker-dhcp-relay.gz | ||
$(DOCKER_DHCP_RELAY)_PATH = $(DOCKERS_PATH)/docker-dhcp-relay | ||
$(DOCKER_DHCP_RELAY)_DEPENDS += $(SONIC_CONFIG_ENGINE) | ||
$(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 |