From 3a9fad7e0c1c0c115c2e6055aab85c972800c901 Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Wed, 8 Jul 2020 05:17:36 +0000 Subject: [PATCH 1/3] [mgmt docker] move pycryptodome installation to the end of the docker building Signed-off-by: Ying Xie --- dockers/docker-sonic-mgmt/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/docker-sonic-mgmt/Dockerfile.j2 b/dockers/docker-sonic-mgmt/Dockerfile.j2 index 3c2bbff2504e..6bf3a17f6fb0 100644 --- a/dockers/docker-sonic-mgmt/Dockerfile.j2 +++ b/dockers/docker-sonic-mgmt/Dockerfile.j2 @@ -49,7 +49,6 @@ RUN pip install cffi==1.10.0 \ prettytable \ psutil \ pyasn1==0.1.9 \ - pycryptodome \ pyfiglet \ pylint==1.8.1 \ pyro4 \ @@ -169,3 +168,4 @@ RUN ~/lib/azure-cli/bin/python -m pip install azure-keyvault==0.3.7 -U # Install Virtual Environment RUN python -m virtualenv --system-site-packages env-201811 RUN env-201811/bin/pip install ansible==2.0.0.2 +RUN pip install pycryptodome From 0ca8eff79bb721b32e516a5b0f16686b274e9f61 Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Wed, 8 Jul 2020 16:16:42 +0000 Subject: [PATCH 2/3] pin down the version to current: 3.9.8 --- dockers/docker-sonic-mgmt/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/docker-sonic-mgmt/Dockerfile.j2 b/dockers/docker-sonic-mgmt/Dockerfile.j2 index 6bf3a17f6fb0..bf43782510bb 100644 --- a/dockers/docker-sonic-mgmt/Dockerfile.j2 +++ b/dockers/docker-sonic-mgmt/Dockerfile.j2 @@ -168,4 +168,4 @@ RUN ~/lib/azure-cli/bin/python -m pip install azure-keyvault==0.3.7 -U # Install Virtual Environment RUN python -m virtualenv --system-site-packages env-201811 RUN env-201811/bin/pip install ansible==2.0.0.2 -RUN pip install pycryptodome +RUN pip install pycryptodome==3.9.8 From b2254c18f3bc818778dd3a7aaf51afdb1fae49b1 Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Wed, 8 Jul 2020 17:35:33 +0000 Subject: [PATCH 3/3] comment --- dockers/docker-sonic-mgmt/Dockerfile.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dockers/docker-sonic-mgmt/Dockerfile.j2 b/dockers/docker-sonic-mgmt/Dockerfile.j2 index bf43782510bb..67142242293c 100644 --- a/dockers/docker-sonic-mgmt/Dockerfile.j2 +++ b/dockers/docker-sonic-mgmt/Dockerfile.j2 @@ -168,4 +168,7 @@ RUN ~/lib/azure-cli/bin/python -m pip install azure-keyvault==0.3.7 -U # Install Virtual Environment RUN python -m virtualenv --system-site-packages env-201811 RUN env-201811/bin/pip install ansible==2.0.0.2 + +# NOTE: There is an ordering dependency for pycryptodome. Leaving this at +# the end until we figure that out. RUN pip install pycryptodome==3.9.8