[build break]: Revert "Conform with new Docker build method" (#257)

dockers/docker-dhcp-relay/Dockerfile

@@ -0,0 +1,25 @@
+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
+

rules/docker-dhcp-relay.mk

@@ -1,13 +1,7 @@
-# Docker image for DHCP relay
+# docker dhcp relay image
 
 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)
 
-
-$(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
+SONIC_SIMPLE_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY)