From bcf8e31028abcf50935639b0cc882a31489b3ed1 Mon Sep 17 00:00:00 2001 From: Ze Gan Date: Fri, 7 Jul 2023 23:30:35 +0800 Subject: [PATCH 1/5] Add protobuf and dashapi to sonic-mgmt Signed-off-by: Ze Gan --- dockers/docker-sonic-mgmt/Dockerfile.j2 | 16 +++++++++++++++- rules/sonic-dash-api.mk | 2 +- slave.mk | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dockers/docker-sonic-mgmt/Dockerfile.j2 b/dockers/docker-sonic-mgmt/Dockerfile.j2 index 5534d3112a4..2ad11eb3208 100755 --- a/dockers/docker-sonic-mgmt/Dockerfile.j2 +++ b/dockers/docker-sonic-mgmt/Dockerfile.j2 @@ -36,7 +36,8 @@ RUN apt-get update && apt-get install -y apt-transport-https \ sudo \ tcpdump \ telnet \ - vim + vim \ + unzip RUN curl -fsSL http://archive.ubuntu.com/ubuntu/pool/universe/s/scapy/python-scapy_2.3.3-3_all.deb \ --output python-scapy_2.3.3-3_all.deb \ @@ -147,6 +148,19 @@ RUN dpkg -i \ debs/{{ deb }}{{' '}} {%- endfor %} +# Download and install sonic util packages for ubuntu20.04 +RUN ubuntu2004_pkg_build_id=$(curl "https://dev.azure.com/mssonic/build/_apis/build/builds?definitions=1055&branchName=refs/heads/master&resultFilter=succeeded&statusFilter=completed&api-version=6.0" | jq -r '.value[0].id') \ + && ubuntu2004_pkg_url=$(curl "https://dev.azure.com/mssonic/build/_apis/build/builds/${ubuntu2004_pkg_build_id}/artifacts?artifactName=sonic-buildimage.amd64.ubuntu20_04&api-version=5.0" | jq -r '.resource.downloadUrl') \ + && wget "${ubuntu2004_pkg_url}" -O sonic-buildimage.amd64.ubuntu20_04.zip \ + && unzip sonic-buildimage.amd64.ubuntu20_04.zip \ + && dpkg -i sonic-buildimage.amd64.ubuntu20_04/libprotobuf-*_amd64.deb \ + sonic-buildimage.amd64.ubuntu20_04/python3-protobuf_*_amd64.deb \ + sonic-buildimage.amd64.ubuntu20_04/libprotobuf*_amd64.deb \ + sonic-buildimage.amd64.ubuntu20_04/libprotoc*_amd64.deb \ + sonic-buildimage.amd64.ubuntu20_04/protobuf-compiler_3.21.12-3_amd64.deb \ + sonic-buildimage.amd64.ubuntu20_04/libdashapi_*_amd64.deb \ + && rm -rf sonic-buildimage.amd64.ubuntu20_04 + RUN mkdir /var/run/sshd EXPOSE 22 diff --git a/rules/sonic-dash-api.mk b/rules/sonic-dash-api.mk index eeea7271d8c..e6d9e34c039 100644 --- a/rules/sonic-dash-api.mk +++ b/rules/sonic-dash-api.mk @@ -6,7 +6,7 @@ LIB_SONIC_DASH_API = libdashapi_$(LIB_SONIC_DASH_API_VERSION)_$(CONFIGURED_ARCH) $(LIB_SONIC_DASH_API)_SRC_PATH = $(SRC_PATH)/sonic-dash-api $(LIB_SONIC_DASH_API)_DEPENDS += $(PROTOBUF) $(PROTOBUF_LITE) $(PROTOBUF_DEV) $(PROTOBUF_COMPILER) -$(LIB_SONIC_DASH_API)_RDEPENDS += $(LIBSWSSCOMMON) $(LIBNL3) $(LIBNL_GENL3) $(LIBNL_ROUTE3) $(PROTOBUF) $(PROTOBUF_LITE) +$(LIB_SONIC_DASH_API)_RDEPENDS += $(PROTOBUF) $(PROTOBUF_LITE) $(PYTHON3_PROTOBUF) SONIC_DPKG_DEBS += $(LIB_SONIC_DASH_API) diff --git a/slave.mk b/slave.mk index a592bc5b43a..1d45553ac40 100644 --- a/slave.mk +++ b/slave.mk @@ -1560,4 +1560,4 @@ jessie : $$(addprefix $(TARGET_PATH)/,$$(JESSIE_DOCKER_IMAGES)) \ ## To build some commonly used libs. Some submodules depend on these libs. ## It is used in component pipelines. For example: swss needs libnl, libyang -lib-packages: $(addprefix $(DEBS_PATH)/,$(LIBNL3) $(LIBYANG)) +lib-packages: $(addprefix $(DEBS_PATH)/,$(LIBNL3) $(LIBYANG) $(PROTOBUF) $(LIB_SONIC_DASH_API)) From 0d415b63cc254c1c7eb1c7137c81eb1a2f0a9775 Mon Sep 17 00:00:00 2001 From: Ze Gan Date: Mon, 10 Jul 2023 21:56:16 +0800 Subject: [PATCH 2/5] Fix comment Signed-off-by: Ze Gan --- .azure-pipelines/docker-sonic-mgmt.yml | 3 +- dockers/docker-sonic-mgmt/Dockerfile.j2 | 43 ++++++++++++++++++------- slave.mk | 4 +++ 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/.azure-pipelines/docker-sonic-mgmt.yml b/.azure-pipelines/docker-sonic-mgmt.yml index 34adf9d5d48..9dbf749b9b0 100644 --- a/.azure-pipelines/docker-sonic-mgmt.yml +++ b/.azure-pipelines/docker-sonic-mgmt.yml @@ -40,8 +40,7 @@ stages: clean: true - bash: | set -xe - git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data - + git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data src/sonic-dash-api/sonic-dash-api make SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y configure PLATFORM=generic make SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y target/docker-sonic-mgmt.gz cp target -r $(Build.ArtifactStagingDirectory)/target diff --git a/dockers/docker-sonic-mgmt/Dockerfile.j2 b/dockers/docker-sonic-mgmt/Dockerfile.j2 index 2ad11eb3208..7a7e59289b7 100755 --- a/dockers/docker-sonic-mgmt/Dockerfile.j2 +++ b/dockers/docker-sonic-mgmt/Dockerfile.j2 @@ -148,18 +148,37 @@ RUN dpkg -i \ debs/{{ deb }}{{' '}} {%- endfor %} -# Download and install sonic util packages for ubuntu20.04 -RUN ubuntu2004_pkg_build_id=$(curl "https://dev.azure.com/mssonic/build/_apis/build/builds?definitions=1055&branchName=refs/heads/master&resultFilter=succeeded&statusFilter=completed&api-version=6.0" | jq -r '.value[0].id') \ - && ubuntu2004_pkg_url=$(curl "https://dev.azure.com/mssonic/build/_apis/build/builds/${ubuntu2004_pkg_build_id}/artifacts?artifactName=sonic-buildimage.amd64.ubuntu20_04&api-version=5.0" | jq -r '.resource.downloadUrl') \ - && wget "${ubuntu2004_pkg_url}" -O sonic-buildimage.amd64.ubuntu20_04.zip \ - && unzip sonic-buildimage.amd64.ubuntu20_04.zip \ - && dpkg -i sonic-buildimage.amd64.ubuntu20_04/libprotobuf-*_amd64.deb \ - sonic-buildimage.amd64.ubuntu20_04/python3-protobuf_*_amd64.deb \ - sonic-buildimage.amd64.ubuntu20_04/libprotobuf*_amd64.deb \ - sonic-buildimage.amd64.ubuntu20_04/libprotoc*_amd64.deb \ - sonic-buildimage.amd64.ubuntu20_04/protobuf-compiler_3.21.12-3_amd64.deb \ - sonic-buildimage.amd64.ubuntu20_04/libdashapi_*_amd64.deb \ - && rm -rf sonic-buildimage.amd64.ubuntu20_04 + +# Build and install protobuf +RUN apt-get install -y make wget libtool m4 autoconf dh-exec libdebhelper-perl=13.6ubuntu1~bpo20.04.1 debhelper=13.6ubuntu1~bpo20.04.1 \ + cmake pkg-config python3-pip python cmake libgtest-dev libgmock-dev libyang-dev \ + debhelper-compat dh-elpa dh-sequence-python3 python3-all \ + libpython3-all-dev python3-six xmlto unzip rake-compiler gem2deb pkg-php-tools \ + ant default-jdk maven-repo-helper libguava-java \ + && wget http://ftp.us.debian.org/debian/pool/main/libg/libgoogle-gson-java/libgoogle-gson-java_2.8.6-1+deb11u1_all.deb \ + && dpkg -i libgoogle-gson-java_2.8.6-1+deb11u1_all.deb \ + && rm -f libgoogle-gson-java_2.8.6-1+deb11u1_all.deb +RUN mkdir -p /tmp/protobuf \ + && mkdir -p /tmp/artifacts +COPY src/protobuf/Makefile /tmp/protobuf/ +COPY rules/protobuf.mk /tmp/protobuf/ +RUN cd /tmp/protobuf \ + && SONIC_CONFIG_MAKE_JOBS=$(nproc) CONFIGURED_ARCH=amd64 DEST=/tmp/artifacts make -f protobuf.mk -f Makefile \ + && cd /tmp/artifacts \ + && dpkg -i libprotobuf*_amd64.deb \ + python3-protobuf_*_amd64.deb \ + libprotoc*_amd64.deb \ + protobuf-compiler_3.21.12-3_amd64.deb \ + && rm -rf /tmp/protobuf \ + && rm -rf /tmp/artifacts + +# Build and install sonic-dash-api +RUN mkdir -p /tmp/sonic-dash-api/src +COPY src/sonic-dash-api /tmp/sonic-dash-api/src +RUN cd /tmp/sonic-dash-api/src \ + && dpkg-buildpackage -rfakeroot -b -us -uc \ + && dpkg -i ../libdashapi_*_amd64.deb \ + && rm -rf /tmp/sonic-dash-api RUN mkdir /var/run/sshd EXPOSE 22 diff --git a/slave.mk b/slave.mk index 1d45553ac40..cf6e73fdd1c 100644 --- a/slave.mk +++ b/slave.mk @@ -1055,11 +1055,15 @@ $(addprefix $(TARGET_PATH)/, $(DOCKER_IMAGES)) : $(TARGET_PATH)/%.gz : .platform mkdir -p $($*.gz_PATH)/files $(LOG) mkdir -p $($*.gz_PATH)/python-debs $(LOG) mkdir -p $($*.gz_PATH)/python-wheels $(LOG) + mkdir -p $($*.gz_PATH)/src $(LOG) + mkdir -p $($*.gz_PATH)/rules $(LOG) mkdir -p $(TARGET_PATH)/vcache/$* $($*.gz_PATH)/vcache $(LOG) sudo mount --bind $($*.gz_DEBS_PATH) $($*.gz_PATH)/debs $(LOG) sudo mount --bind $($*.gz_FILES_PATH) $($*.gz_PATH)/files $(LOG) sudo mount --bind $(PYTHON_DEBS_PATH) $($*.gz_PATH)/python-debs $(LOG) sudo mount --bind $(PYTHON_WHEELS_PATH) $($*.gz_PATH)/python-wheels $(LOG) + sudo mount --bind $(SRC_PATH) $($*.gz_PATH)/src $(LOG) + sudo mount --bind $(RULES_PATH) $($*.gz_PATH)/rules $(LOG) # Export variables for j2. Use path for unique variable names, e.g. docker_orchagent_debs $(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_debs=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_DEPENDS),RDEPENDS))\n" | awk '!a[$$0]++')) $(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_pydebs=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_PYTHON_DEBS)))\n" | awk '!a[$$0]++')) From f6c2d3b4318e6662f2bfcccaa47980e18c0abbee Mon Sep 17 00:00:00 2001 From: Ze Gan Date: Thu, 13 Jul 2023 14:38:17 +0800 Subject: [PATCH 3/5] Revert "Fix comment" This reverts commit 0d415b63cc254c1c7eb1c7137c81eb1a2f0a9775. --- .azure-pipelines/docker-sonic-mgmt.yml | 3 +- dockers/docker-sonic-mgmt/Dockerfile.j2 | 43 +++++++------------------ slave.mk | 4 --- 3 files changed, 14 insertions(+), 36 deletions(-) diff --git a/.azure-pipelines/docker-sonic-mgmt.yml b/.azure-pipelines/docker-sonic-mgmt.yml index 9dbf749b9b0..34adf9d5d48 100644 --- a/.azure-pipelines/docker-sonic-mgmt.yml +++ b/.azure-pipelines/docker-sonic-mgmt.yml @@ -40,7 +40,8 @@ stages: clean: true - bash: | set -xe - git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data src/sonic-dash-api/sonic-dash-api + git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data + make SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y configure PLATFORM=generic make SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y target/docker-sonic-mgmt.gz cp target -r $(Build.ArtifactStagingDirectory)/target diff --git a/dockers/docker-sonic-mgmt/Dockerfile.j2 b/dockers/docker-sonic-mgmt/Dockerfile.j2 index 7a7e59289b7..2ad11eb3208 100755 --- a/dockers/docker-sonic-mgmt/Dockerfile.j2 +++ b/dockers/docker-sonic-mgmt/Dockerfile.j2 @@ -148,37 +148,18 @@ RUN dpkg -i \ debs/{{ deb }}{{' '}} {%- endfor %} - -# Build and install protobuf -RUN apt-get install -y make wget libtool m4 autoconf dh-exec libdebhelper-perl=13.6ubuntu1~bpo20.04.1 debhelper=13.6ubuntu1~bpo20.04.1 \ - cmake pkg-config python3-pip python cmake libgtest-dev libgmock-dev libyang-dev \ - debhelper-compat dh-elpa dh-sequence-python3 python3-all \ - libpython3-all-dev python3-six xmlto unzip rake-compiler gem2deb pkg-php-tools \ - ant default-jdk maven-repo-helper libguava-java \ - && wget http://ftp.us.debian.org/debian/pool/main/libg/libgoogle-gson-java/libgoogle-gson-java_2.8.6-1+deb11u1_all.deb \ - && dpkg -i libgoogle-gson-java_2.8.6-1+deb11u1_all.deb \ - && rm -f libgoogle-gson-java_2.8.6-1+deb11u1_all.deb -RUN mkdir -p /tmp/protobuf \ - && mkdir -p /tmp/artifacts -COPY src/protobuf/Makefile /tmp/protobuf/ -COPY rules/protobuf.mk /tmp/protobuf/ -RUN cd /tmp/protobuf \ - && SONIC_CONFIG_MAKE_JOBS=$(nproc) CONFIGURED_ARCH=amd64 DEST=/tmp/artifacts make -f protobuf.mk -f Makefile \ - && cd /tmp/artifacts \ - && dpkg -i libprotobuf*_amd64.deb \ - python3-protobuf_*_amd64.deb \ - libprotoc*_amd64.deb \ - protobuf-compiler_3.21.12-3_amd64.deb \ - && rm -rf /tmp/protobuf \ - && rm -rf /tmp/artifacts - -# Build and install sonic-dash-api -RUN mkdir -p /tmp/sonic-dash-api/src -COPY src/sonic-dash-api /tmp/sonic-dash-api/src -RUN cd /tmp/sonic-dash-api/src \ - && dpkg-buildpackage -rfakeroot -b -us -uc \ - && dpkg -i ../libdashapi_*_amd64.deb \ - && rm -rf /tmp/sonic-dash-api +# Download and install sonic util packages for ubuntu20.04 +RUN ubuntu2004_pkg_build_id=$(curl "https://dev.azure.com/mssonic/build/_apis/build/builds?definitions=1055&branchName=refs/heads/master&resultFilter=succeeded&statusFilter=completed&api-version=6.0" | jq -r '.value[0].id') \ + && ubuntu2004_pkg_url=$(curl "https://dev.azure.com/mssonic/build/_apis/build/builds/${ubuntu2004_pkg_build_id}/artifacts?artifactName=sonic-buildimage.amd64.ubuntu20_04&api-version=5.0" | jq -r '.resource.downloadUrl') \ + && wget "${ubuntu2004_pkg_url}" -O sonic-buildimage.amd64.ubuntu20_04.zip \ + && unzip sonic-buildimage.amd64.ubuntu20_04.zip \ + && dpkg -i sonic-buildimage.amd64.ubuntu20_04/libprotobuf-*_amd64.deb \ + sonic-buildimage.amd64.ubuntu20_04/python3-protobuf_*_amd64.deb \ + sonic-buildimage.amd64.ubuntu20_04/libprotobuf*_amd64.deb \ + sonic-buildimage.amd64.ubuntu20_04/libprotoc*_amd64.deb \ + sonic-buildimage.amd64.ubuntu20_04/protobuf-compiler_3.21.12-3_amd64.deb \ + sonic-buildimage.amd64.ubuntu20_04/libdashapi_*_amd64.deb \ + && rm -rf sonic-buildimage.amd64.ubuntu20_04 RUN mkdir /var/run/sshd EXPOSE 22 diff --git a/slave.mk b/slave.mk index cf6e73fdd1c..1d45553ac40 100644 --- a/slave.mk +++ b/slave.mk @@ -1055,15 +1055,11 @@ $(addprefix $(TARGET_PATH)/, $(DOCKER_IMAGES)) : $(TARGET_PATH)/%.gz : .platform mkdir -p $($*.gz_PATH)/files $(LOG) mkdir -p $($*.gz_PATH)/python-debs $(LOG) mkdir -p $($*.gz_PATH)/python-wheels $(LOG) - mkdir -p $($*.gz_PATH)/src $(LOG) - mkdir -p $($*.gz_PATH)/rules $(LOG) mkdir -p $(TARGET_PATH)/vcache/$* $($*.gz_PATH)/vcache $(LOG) sudo mount --bind $($*.gz_DEBS_PATH) $($*.gz_PATH)/debs $(LOG) sudo mount --bind $($*.gz_FILES_PATH) $($*.gz_PATH)/files $(LOG) sudo mount --bind $(PYTHON_DEBS_PATH) $($*.gz_PATH)/python-debs $(LOG) sudo mount --bind $(PYTHON_WHEELS_PATH) $($*.gz_PATH)/python-wheels $(LOG) - sudo mount --bind $(SRC_PATH) $($*.gz_PATH)/src $(LOG) - sudo mount --bind $(RULES_PATH) $($*.gz_PATH)/rules $(LOG) # Export variables for j2. Use path for unique variable names, e.g. docker_orchagent_debs $(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_debs=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_DEPENDS),RDEPENDS))\n" | awk '!a[$$0]++')) $(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_pydebs=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_PYTHON_DEBS)))\n" | awk '!a[$$0]++')) From aea69808644c73b4354861b9ec6789a690f28c7c Mon Sep 17 00:00:00 2001 From: Ze Gan Date: Thu, 13 Jul 2023 14:54:13 +0800 Subject: [PATCH 4/5] Fix comments Signed-off-by: Ze Gan --- dockers/docker-sonic-mgmt/Dockerfile.j2 | 32 +++++++++++++++---------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/dockers/docker-sonic-mgmt/Dockerfile.j2 b/dockers/docker-sonic-mgmt/Dockerfile.j2 index 2ad11eb3208..4591e411f2c 100755 --- a/dockers/docker-sonic-mgmt/Dockerfile.j2 +++ b/dockers/docker-sonic-mgmt/Dockerfile.j2 @@ -148,18 +148,26 @@ RUN dpkg -i \ debs/{{ deb }}{{' '}} {%- endfor %} -# Download and install sonic util packages for ubuntu20.04 -RUN ubuntu2004_pkg_build_id=$(curl "https://dev.azure.com/mssonic/build/_apis/build/builds?definitions=1055&branchName=refs/heads/master&resultFilter=succeeded&statusFilter=completed&api-version=6.0" | jq -r '.value[0].id') \ - && ubuntu2004_pkg_url=$(curl "https://dev.azure.com/mssonic/build/_apis/build/builds/${ubuntu2004_pkg_build_id}/artifacts?artifactName=sonic-buildimage.amd64.ubuntu20_04&api-version=5.0" | jq -r '.resource.downloadUrl') \ - && wget "${ubuntu2004_pkg_url}" -O sonic-buildimage.amd64.ubuntu20_04.zip \ - && unzip sonic-buildimage.amd64.ubuntu20_04.zip \ - && dpkg -i sonic-buildimage.amd64.ubuntu20_04/libprotobuf-*_amd64.deb \ - sonic-buildimage.amd64.ubuntu20_04/python3-protobuf_*_amd64.deb \ - sonic-buildimage.amd64.ubuntu20_04/libprotobuf*_amd64.deb \ - sonic-buildimage.amd64.ubuntu20_04/libprotoc*_amd64.deb \ - sonic-buildimage.amd64.ubuntu20_04/protobuf-compiler_3.21.12-3_amd64.deb \ - sonic-buildimage.amd64.ubuntu20_04/libdashapi_*_amd64.deb \ - && rm -rf sonic-buildimage.amd64.ubuntu20_04 +# Install protobuf 3.21.12 +RUN mkdir -p /tmp/protobuf \ + cd /tmp/protobuf \ + && wget https://sonicstorage.blob.core.windows.net/public/ubuntu/20.04/libprotobuf-dev_3.21.12-3_amd64.deb \ + && wget https://sonicstorage.blob.core.windows.net/public/ubuntu/20.04/libprotobuf-lite32_3.21.12-3_amd64.deb \ + && wget https://sonicstorage.blob.core.windows.net/public/ubuntu/20.04/libprotobuf32_3.21.12-3_amd64.deb \ + && wget https://sonicstorage.blob.core.windows.net/public/ubuntu/20.04/libprotoc-dev_3.21.12-3_amd64.deb \ + && wget https://sonicstorage.blob.core.windows.net/public/ubuntu/20.04/libprotoc32_3.21.12-3_amd64.deb \ + && wget https://sonicstorage.blob.core.windows.net/public/ubuntu/20.04/protobuf-compiler_3.21.12-3_amd64.deb \ + && wget https://sonicstorage.blob.core.windows.net/public/ubuntu/20.04/python3-protobuf_3.21.12-3_amd64.deb \ + && dpkg -i *.deb \ + && rm -rf /tmp/protobuf + +# Install dash-api +RUN cd /tmp \ + && mkdir -p /usr/lib/python3/dist-packages/dash_api \ + && wget https://raw.githubusercontent.com/sonic-net/sonic-buildimage/master/src/sonic-dash-api/pypkg/__init__.py -O /usr/lib/python3/dist-packages/dash_api/__init__.py \ + && git clone https://github.com/sonic-net/sonic-dash-api.git \ + && protoc -I=sonic-dash-api/proto --python_out=/usr/lib/python3/dist-packages/dash_api sonic-dash-api/proto/*.proto \ + && rm -rf /tmp/sonic-dash-api RUN mkdir /var/run/sshd EXPOSE 22 From fe31591410cb216af73b19fbc9903dc7911ab596 Mon Sep 17 00:00:00 2001 From: Ze Gan Date: Fri, 14 Jul 2023 12:37:32 +0800 Subject: [PATCH 5/5] Remove unzip Signed-off-by: Ze Gan --- dockers/docker-sonic-mgmt/Dockerfile.j2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dockers/docker-sonic-mgmt/Dockerfile.j2 b/dockers/docker-sonic-mgmt/Dockerfile.j2 index 4591e411f2c..7b3ddec1d05 100755 --- a/dockers/docker-sonic-mgmt/Dockerfile.j2 +++ b/dockers/docker-sonic-mgmt/Dockerfile.j2 @@ -36,8 +36,7 @@ RUN apt-get update && apt-get install -y apt-transport-https \ sudo \ tcpdump \ telnet \ - vim \ - unzip + vim RUN curl -fsSL http://archive.ubuntu.com/ubuntu/pool/universe/s/scapy/python-scapy_2.3.3-3_all.deb \ --output python-scapy_2.3.3-3_all.deb \