Skip to content

Commit acc17db

Browse files
authored
Revert PR#11831 (#12035) "Upgrade docker-sonic-mgmt base image from Ubuntu18.04 to 20.04"
1 parent 549bb3d commit acc17db

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

dockers/docker-sonic-mgmt/Dockerfile.j2

+10-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% set prefix = DEFAULT_CONTAINER_REGISTRY %}
2-
FROM {{ prefix }}ubuntu:20.04
2+
FROM {{ prefix }}ubuntu:18.04
33

44
ENV DEBIAN_FRONTEND=noninteractive
55

@@ -21,6 +21,8 @@ RUN apt-get update && apt-get install -y build-essential \
2121
psmisc \
2222
python \
2323
python-dev \
24+
python-scapy \
25+
python-pip \
2426
python3-pip \
2527
python3-venv \
2628
rsyslog \
@@ -29,16 +31,10 @@ RUN apt-get update && apt-get install -y build-essential \
2931
sudo \
3032
tcpdump \
3133
telnet \
32-
vim \
33-
python-is-python2 \
34-
software-properties-common
35-
36-
RUN add-apt-repository -y universe
37-
RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py \
38-
&& python2 get-pip.py
34+
vim
3935

4036
RUN pip install setuptools==44.1.1
41-
RUN pip install cffi==1.12.0 \
37+
RUN pip install cffi==1.10.0 \
4238
contextlib2==0.6.0.post1 \
4339
cryptography==3.3.2 \
4440
"future>=0.16.0" \
@@ -100,7 +96,7 @@ RUN pip install cffi==1.12.0 \
10096
&& rm -f 1.0.0.tar.gz \
10197
&& pip install nnpy \
10298
&& pip install dpkt \
103-
&& pip install scapy==2.4.5 --upgrade --ignore-installed
99+
&& pip install scapy==2.4.5 --upgrade
104100

105101
# Install docker-ce-cli
106102
RUN apt-get update \
@@ -131,7 +127,7 @@ debs/{{ deb }}{{' '}}
131127
{%- endfor -%}
132128
debs/
133129

134-
RUN dpkg --force-all -i \
130+
RUN dpkg -i \
135131
{% for deb in docker_sonic_mgmt_debs.split(' ') -%}
136132
debs/{{ deb }}{{' '}}
137133
{%- endfor %}
@@ -197,7 +193,8 @@ ENV PATH="$VIRTUAL_ENV/bin:$PATH"
197193

198194
ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 PYTHONIOENCODING=UTF-8
199195

200-
RUN python3 -m pip install --upgrade --ignore-installed pip setuptools==58.4.0 wheel==0.33.6
196+
RUN python3 -m pip install --upgrade --ignore-installed pip setuptools==58.4.0
197+
201198
RUN python3 -m pip install setuptools-rust \
202199
aiohttp \
203200
defusedxml \
@@ -240,6 +237,7 @@ RUN python3 -m pip install setuptools-rust \
240237
tabulate \
241238
textfsm==1.1.2 \
242239
virtualenv \
240+
wheel==0.33.6 \
243241
pysubnettree \
244242
nnpy \
245243
dpkt \

0 commit comments

Comments
 (0)