Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding DHCP Relay Docker to build #104

Closed
wants to merge 6 commits into from
Closed

Adding DHCP Relay Docker to build #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
32e55ee
adding docker-dhcp-relay to build
Dec 7, 2016
f1efcc2
adding dhcp relay docker for default mellanox build
Dec 7, 2016
48d6962
adding docker-dhcp-relay to build
Dec 7, 2016
f14c7df
adding dhcp relay docker for default mellanox build
Dec 7, 2016
181c79c
Resolved conflicts
Jan 13, 2017
d97c8d2
Fix missing line continue
Jan 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions platform/mellanox/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ SONIC_ALL += $(DOCKER_SYNCD_MLNX) \
$(DOCKER_SNMP_SV2) \
$(DOCKER_TEAMD) \
$(DOCKER_PLATFORM_MONITOR) \
$(DOCKER_DHCP_RELAY) \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should only add this to generic rules.mk

debs/$(MLNX_HW_MANAGEMENT) \
debs/$(SX_KERNEL)

Expand Down
7 changes: 7 additions & 0 deletions rules/docker-dhcp-relay.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)