From 3310870855afa8e64f93b116f020032da0655782 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Sat, 21 Jan 2017 02:03:25 +0000 Subject: [PATCH 1/4] Make line breaks consistent in DHCP relay Dockerfile --- dockers/docker-dhcp-relay/Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dockers/docker-dhcp-relay/Dockerfile b/dockers/docker-dhcp-relay/Dockerfile index efc1f7f5c317..17cc13534241 100644 --- a/dockers/docker-dhcp-relay/Dockerfile +++ b/dockers/docker-dhcp-relay/Dockerfile @@ -3,11 +3,12 @@ FROM docker-base ## Make apt-get non-interactive ENV DEBIAN_FRONTEND=noninteractive -## Install isc-dhcp-relay -## Clean up -RUN apt-get update && apt-get -y install \ - isc-dhcp-relay && \ - apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y +## Install isc-dhcp-relay and clean up afterward +RUN apt-get update \ + && apt-get -y install isc-dhcp-relay \ + && apt-get clean -y \ + && apt-get autoclean -y \ + && apt-get autoremove -y COPY isc-dhcp-relay /etc/default/isc-dhcp-relay From 905d1981c7969049f1d5828f495679ecc69a46b9 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Tue, 24 Jan 2017 00:02:56 +0000 Subject: [PATCH 2/4] Add DHCP relay docker to generic build --- platform/generic/rules.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/generic/rules.mk b/platform/generic/rules.mk index cff64a8b6003..bc349ac4e7de 100644 --- a/platform/generic/rules.mk +++ b/platform/generic/rules.mk @@ -3,4 +3,5 @@ SONIC_ALL += $(DOCKER_DATABASE) \ $(DOCKER_TEAMD) \ $(DOCKER_LLDP_SV2) \ $(DOCKER_SNMP_SV2) \ - $(DOCKER_PLATFORM_MONITOR) + $(DOCKER_PLATFORM_MONITOR) \ + $(DOCKER_DHCP_RELAY) From 3bf28de3ccf41f583a23c0d7ded27b608aaed906 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Tue, 24 Jan 2017 02:59:25 +0000 Subject: [PATCH 3/4] Add DCHP relay Docker build rules --- rules/docker-dhcp-relay.mk | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 rules/docker-dhcp-relay.mk diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk new file mode 100644 index 000000000000..1c68e8468a30 --- /dev/null +++ b/rules/docker-dhcp-relay.mk @@ -0,0 +1,7 @@ +# docker dhcp relay image + +DOCKER_DHCP_RELAY = docker-dhcp-relay.gz +$(DOCKER_DHCP_RELAY)_PATH = $(DOCKERS_PATH)/docker-dhcp-relay +$(DOCKER_DHCP_RELAY)_LOAD_DOCKERS = $(DOCKER_BASE) + +SONIC_SIMPLE_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY) From b2883bc77d3c5ac77deddf65021e3187afab6c49 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 25 Jan 2017 20:20:27 +0000 Subject: [PATCH 4/4] Install dpkt Python package in PTF docker --- dockers/docker-ptf/Dockerfile.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2 index ea86fd6c3cff..78f2eb260480 100644 --- a/dockers/docker-ptf/Dockerfile.j2 +++ b/dockers/docker-ptf/Dockerfile.j2 @@ -65,6 +65,7 @@ RUN rm -rf /debs \ && pip install cffi==1.7.0 \ && pip install --upgrade cffi==1.7.0 \ && pip install nnpy \ + && pip install dpkt \ && mkdir -p /opt \ && cd /opt \ && wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py