-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Makefile: Extend to build debug docker images for all stretch dockers #2789
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
941eb7d
Updated Makefile infrastructure to build debug images.
renukamanavalan 042d51e
Dropped the regular binary using DBG_PACKAGES and a small name change…
renukamanavalan 24f38f2
Tweaked the changes to retain the existing behavior w.r.t INSTALL_DEB…
renukamanavalan 4443c70
1) slave.mk - Dropped unused Docker build args
renukamanavalan 7b84e64
Reverted some changes, per review comments.
renukamanavalan c717e50
Merge remote-tracking branch 'upstream/master'
renukamanavalan 60a001c
Get in sync with the new update that filters out dockers to be built …
renukamanavalan cefc4b8
Merge remote-tracking branch 'upstream/master'
renukamanavalan f659917
Mkae a template for each target that can be shared by all platforms.
renukamanavalan 9d7aedb
A small change, that can fit better with other targets too.
renukamanavalan 279084f
Extended debug to all stretch based docker images
renukamanavalan 99783dd
Merge remote-tracking branch 'upstream/master'
renukamanavalan a2297a3
1) Combined all orchagent makefiles into one platform independent mak…
renukamanavalan b4b30fd
Changes per review comments:
renukamanavalan 575e43d
Merge remote-tracking branch 'upstream/master'
renukamanavalan e504eb7
1) Corrected a copy/paste mistake
renukamanavalan 0db6c0f
Fixed a copy/paste bug
renukamanavalan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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,23 +1,14 @@ | ||
| # docker image for syncd | ||
|
|
||
| DOCKER_SYNCD_BFN = docker-syncd-bfn.gz | ||
| $(DOCKER_SYNCD_BFN)_PATH = $(PLATFORM_PATH)/docker-syncd-bfn | ||
| $(DOCKER_SYNCD_BFN)_DEPENDS += $(SYNCD) | ||
| ifeq ($(INSTALL_DEBUG_TOOLS), y) | ||
| $(DOCKER_SYNCD_BFN)_DEPENDS += $(SYNCD_DBG) \ | ||
| DOCKER_SYNCD_PLATFORM_CODE = bfn | ||
| include $(PLATFORM_PATH)/../template/docker-syncd-base.mk | ||
|
|
||
| $(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) | ||
|
|
||
| $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \ | ||
| $(LIBSWSSCOMMON_DBG) \ | ||
| $(LIBSAIMETADATA_DBG) \ | ||
| $(LIBSAIREDIS_DBG) | ||
| endif | ||
| $(DOCKER_SYNCD_BFN)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH) | ||
| SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN) | ||
| SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BFN) | ||
| ifneq ($(ENABLE_SYNCD_RPC),y) | ||
| SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN) | ||
| endif | ||
|
|
||
| $(DOCKER_SYNCD_BFN)_CONTAINER_NAME = syncd | ||
| $(DOCKER_SYNCD_BFN)_RUN_OPT += --net=host --privileged -t | ||
| $(DOCKER_SYNCD_BFN)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf | ||
| $(DOCKER_SYNCD_BFN)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro | ||
| $(DOCKER_SYNCD_BFN)_RUN_OPT += -v /host/warmboot:/var/warmboot | ||
| $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot | ||
|
|
This file contains hidden or 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
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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,25 +1,15 @@ | ||
| # docker image for mlnx syncd | ||
|
|
||
| DOCKER_SYNCD_MLNX = docker-syncd-mlnx.gz | ||
| $(DOCKER_SYNCD_MLNX)_PATH = $(PLATFORM_PATH)/docker-syncd-mlnx | ||
| $(DOCKER_SYNCD_MLNX)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API) | ||
| ifeq ($(INSTALL_DEBUG_TOOLS), y) | ||
| $(DOCKER_SYNCD_MLNX)_DEPENDS += $(SYNCD_DBG) \ | ||
| DOCKER_SYNCD_PLATFORM_CODE = mlnx | ||
| include $(PLATFORM_PATH)/../template/docker-syncd-base.mk | ||
|
|
||
| $(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API) | ||
| $(DOCKER_SYNCD_BASE)_PYTHON_DEBS += $(MLNX_SFPD) | ||
|
|
||
| $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \ | ||
| $(LIBSWSSCOMMON_DBG) \ | ||
| $(LIBSAIMETADATA_DBG) \ | ||
| $(LIBSAIREDIS_DBG) | ||
| endif | ||
| $(DOCKER_SYNCD_MLNX)_PYTHON_DEBS += $(MLNX_SFPD) | ||
| $(DOCKER_SYNCD_MLNX)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH) | ||
| SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX) | ||
| SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_MLNX) | ||
| ifneq ($(ENABLE_SYNCD_RPC),y) | ||
| SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX) | ||
| endif | ||
|
|
||
| $(DOCKER_SYNCD_MLNX)_CONTAINER_NAME = syncd | ||
| $(DOCKER_SYNCD_MLNX)_RUN_OPT += --net=host --privileged -t | ||
| $(DOCKER_SYNCD_MLNX)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf | ||
| $(DOCKER_SYNCD_MLNX)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro | ||
| $(DOCKER_SYNCD_MLNX)_RUN_OPT += -v /host/warmboot:/var/warmboot | ||
| $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot | ||
|
|
||
This file contains hidden or 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
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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
This file contains hidden or 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,33 @@ | ||
| # docker image for syncd | ||
|
|
||
|
|
||
| DOCKER_SYNCD_BASE_STEM = docker-syncd-$(DOCKER_SYNCD_PLATFORM_CODE) | ||
| DOCKER_SYNCD_BASE = $(DOCKER_SYNCD_BASE_STEM).gz | ||
| DOCKER_SYNCD_BASE_DBG = $(DOCKER_SYNCD_BASE_STEM)-$(DBG_IMAGE_MARK).gz | ||
|
|
||
| $(DOCKER_SYNCD_BASE)_PATH = $(PLATFORM_PATH)/docker-syncd-$(DOCKER_SYNCD_PLATFORM_CODE) | ||
|
|
||
| $(DOCKER_SYNCD_BASE)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH) | ||
|
|
||
| $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_DEPENDS) | ||
|
|
||
| $(DOCKER_SYNCD_BASE)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_PACKAGES) | ||
|
|
||
| SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BASE) | ||
| SONIC_STRETCH_DOCKERS += $(DOCKER_SYNCD_BASE) | ||
| ifneq ($(ENABLE_SYNCD_RPC),y) | ||
| SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BASE) | ||
| endif | ||
|
|
||
| SONIC_DOCKER_DBG_IMAGES += $(DOCKER_SYNCD_BASE_DBG) | ||
| SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG) | ||
| ifneq ($(ENABLE_SYNCD_RPC),y) | ||
| SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_SYNCD_BASE_DBG) | ||
| endif | ||
|
|
||
|
|
||
| $(DOCKER_SYNCD_BASE)_CONTAINER_NAME = syncd | ||
| $(DOCKER_SYNCD_BASE)_RUN_OPT += --net=host --privileged -t | ||
| $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf | ||
| $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro | ||
|
|
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.