Revert "[mellanox]: Integrate CRIU tool to SYNCD docker container (so…

…nic-net#2061)" This reverts commit 514b38f. Conflicts: platform/mellanox/docker-syncd-mlnx.mk sonic-slave/Dockerfile
stepanblyschak · Jan 10, 2019 · 2601785 · 2601785
1 parent ec7b1d1
commit 2601785
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 38 deletions.
diff --git a/platform/mellanox/criu.mk b/platform/mellanox/criu.mk
diff --git a/platform/mellanox/criu/Makefile b/platform/mellanox/criu/Makefile
diff --git a/platform/mellanox/docker-syncd-mlnx.mk b/platform/mellanox/docker-syncd-mlnx.mk
@@ -2,7 +2,7 @@
 
 DOCKER_SYNCD_MLNX = docker-syncd-mlnx.gz
 $(DOCKER_SYNCD_MLNX)_PATH = $(PLATFORM_PATH)/docker-syncd-mlnx
-$(DOCKER_SYNCD_MLNX)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API) $(MLNX_SFPD) $(CRIU) $(MLNX_ISSU)
+$(DOCKER_SYNCD_MLNX)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API) $(MLNX_SFPD) $(MLNX_ISSU)
 $(DOCKER_SYNCD_MLNX)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
 SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX)
 ifneq ($(ENABLE_SYNCD_RPC),y)
@@ -14,4 +14,4 @@ $(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_MLNX)_RUN_OPT += --tmpfs /run/criu
+
diff --git a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
@@ -14,7 +14,7 @@ debs/{{ deb }}{{' '}}
 {%- endfor -%}
 debs/
 
-RUN apt-get install -y --no-install-recommends libxml2 iptables libbsd0 protobuf-c-compiler protobuf-compiler python-protobuf libprotobuf-c1 python-future python-ipaddr libnet1 pkg-config asciidoc xmlto
+RUN apt-get install -y libxml2
 
 RUN dpkg -i \
 {% for deb in docker_syncd_mlnx_debs.split(' ') -%}

diff --git a/sonic-slave/Dockerfile b/sonic-slave/Dockerfile
@@ -232,19 +232,6 @@ RUN apt-get update && apt-get install -y \
         texi2html \
 # For initramfs
         bash-completion \
-# For Mellanox CRIU build
-        libprotobuf-dev \
-        libprotobuf-c0-dev \
-        protobuf-c-compiler \
-        protobuf-compiler \
-        python-protobuf \
-        pkg-config \
-        libnet1-dev \
-        libnet-dev \
-        libaio-dev \
-        asciidoc \
-        xmlto \
-        checkinstall \
 # For sonic vs image build
         dosfstools \
         qemu-kvm \