Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…mage into pde_infra
  • Loading branch information
geans-pin committed May 27, 2021
2 parents 18c82ae + 1945c12 commit 38592f9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
3 changes: 1 addition & 2 deletions dockers/docker-pde/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ RUN apt-get install -y python-jsonschema

RUN pip3 install pytest pexpect


{% if docker_pde_debs.strip() -%}
# Copy locally-built Debian package dependencies
COPY \
Expand Down Expand Up @@ -62,9 +61,9 @@ python-wheels/{{ whl }}{{' '}}
/python-wheels/

# Install locally-built Python wheel dependencies

RUN pip3 install \


{% for whl in docker_pde_whls.split(' ') -%}
/python-wheels/{{ whl }}{{' '}}
{%- endfor %}
Expand Down
4 changes: 1 addition & 3 deletions platform/broadcom/docker-pde.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# Docker image for SONiC Platform Development Environment (PDE)


ifeq ($(ENABLE_PDE), y)

DOCKER_PDE_STEM = docker-pde
Expand All @@ -16,6 +14,7 @@ $(DOCKER_PDE_RDEPENDS += $(PYTHON_NETIFACES)

$(DOCKER_PDE)_PYTHON_DEBS += $(SONIC_UTILS)
$(DOCKER_PDE)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY3)

ifeq ($(PDDF_SUPPORT), y)
$(DOCKER_PDE)_PYTHON_WHEELS += $(PDDF_PLATFORM_API_BASE_PY3)
endif
Expand All @@ -39,7 +38,6 @@ $(DOCKER_PDE)_RUN_OPT += --net=host --privileged -t
$(DOCKER_PDE)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
$(DOCKER_PDE)_RUN_OPT += -v /host/machine.conf:/host/machine.conf:ro
$(DOCKER_PDE)_RUN_OPT += -v /usr/lib/python2.7/dist-packages:/usr/share/sonic/classes:ro

$(DOCKER_PDE)_RUN_OPT += -v /usr/local/lib/python3.7/dist-packages/utilities_common:/usr/local/lib/python3.7/dist-packages/utilities_common:ro
$(DOCKER_PDE)_RUN_OPT += -v /var/log/syslog:/var/log/syslog:ro
$(DOCKER_PDE)_RUN_OPT += -v /lib/modules:/lib/modules:ro
Expand Down

0 comments on commit 38592f9

Please sign in to comment.