Skip to content

Commit f4fdf31

Browse files
authored
[build] Fix the snmp docker build error. (#7452) (#7459)
* [build] Fix the snmp docker build error. (#7452) Issue is get_pip.py is moved to pip 21.1 (https://github.com/pypa/get-pip/commits/main) which is not compatible with 3.6. Issue of pip itself is fixed as part of 21.1.1 in pip community (pypa/pip#9835). However get-pip.py is still not updated to latest pip. Also get.pip.py does not support python 3.6 version explicitly (pypa/get-pip#88) Step 15/29 : RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 ---> Running in bece31f49267 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 1891k 100 1891k 0 0 9564k 0 --:--:-- --:--:-- --:--:-- 9600k Traceback (most recent call last): File "<stdin>", line 24298, in <module> File "<stdin>", line 139, in main File "<stdin>", line 115, in bootstrap File "<stdin>", line 96, in monkeypatch_for_cert File "/tmp/tmp5fnxrz0a/pip.zip/pip/_internal/commands/__init__.py", line 9, in <module> File "/tmp/tmp5fnxrz0a/pip.zip/pip/_internal/cli/base_command.py", line 12, in <module> File "/tmp/tmp5fnxrz0a/pip.zip/pip/_internal/cli/cmdoptions.py", line 30, in <module> File "/tmp/tmp5fnxrz0a/pip.zip/pip/_internal/utils/hashes.py", line 2, in <module> ImportError: cannot import name 'NoReturn' The command '/bin/sh -c curl https://bootstrap.pypa.io/get-pip.py | python3.6' returned a non-zero code: 1 How I did: Got the file from https://github.com/pypa/get-pip/tree/21.0 and added to the buildimage pin pip to the previous release 21.0.1. (Similar is done in other public repos eg: grpc/grpc-java#8115) Signed-off-by: Abhishek Dosi <[email protected]>
1 parent b813736 commit f4fdf31

File tree

4 files changed

+24236
-9
lines changed

4 files changed

+24236
-9
lines changed

azure-pipelines.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ stages:
3333
git submodule update --init --recursive
3434
displayName: 'reset submodules'
3535
- script: |
36+
set -ex
3637
sudo modprobe overlay
37-
CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=rcache SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/broadcom"
38-
make configure PLATFORM=broadcom
38+
ENABLE_DOCKER_BASE_PULL=y make configure PLATFORM=broadcom
3939
trap "sudo rm -rf fsroot" EXIT
40-
make USERNAME=admin SONIC_BUILD_JOBS=$(nproc) $CACHE_OPTIONS target/sonic-broadcom.bin
40+
make USERNAME=admin SONIC_BUILD_JOBS=$(nproc) target/sonic-broadcom.bin
4141
displayName: 'Build sonic image'
4242
- publish: $(System.DefaultWorkingDirectory)/
4343
artifact: sonic-buildimage.broadcom.201811
@@ -57,9 +57,9 @@ stages:
5757
git submodule update --init --recursive
5858
displayName: 'reset submodules'
5959
- script: |
60+
set -ex
6061
sudo modprobe overlay
61-
CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=rcache SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/mellanox"
62-
make configure PLATFORM=mellanox
62+
ENABLE_DOCKER_BASE_PULL=y make configure PLATFORM=mellanox
6363
trap "sudo rm -rf fsroot" EXIT
6464
make USERNAME=admin SONIC_BUILD_JOBS=$(nproc) $CACHE_OPTIONS target/sonic-mellanox.bin
6565
displayName: 'Build sonic image'
@@ -81,12 +81,11 @@ stages:
8181
git submodule update --init --recursive
8282
displayName: 'reset submodules'
8383
- script: |
84-
echo $(Build.BuildNumber)
84+
set -ex
8585
sudo modprobe overlay
86-
CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=rcache SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/vs"
8786
ENABLE_DOCKER_BASE_PULL=y make configure PLATFORM=vs
8887
trap "sudo rm -rf fsroot" EXIT
89-
make USERNAME=admin SONIC_BUILD_JOBS=$(nproc) $CACHE_OPTIONS \
88+
make USERNAME=admin SONIC_BUILD_JOBS=$(nproc) \
9089
target/docker-sonic-vs.gz target/sonic-vs.img.gz && \
9190
sudo cp target/sonic-vs.img.gz /nfs/azpl/kvmimage/sonic-vs.$(Build.BuildNumber).img.gz
9291
displayName: 'Build sonic image'

dockers/docker-snmp-sv2/Dockerfile.j2

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return
3232
{%- endif %}
3333

3434
# Install up-to-date version of pip
35-
RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6
35+
COPY ["get-pip.py", "/usr/bin/"]
36+
RUN python3.6 /usr/bin/get-pip.py pip==21.0.1
3637

3738
# pin down setuptools version for issues to install sonic_ax_impl
3839
# see https://github.com/Azure/sonic-buildimage/issues/5279

0 commit comments

Comments
 (0)