From b1948ddf00f151658772c5b295da5a9c66fb8dcd Mon Sep 17 00:00:00 2001 From: "Mahadik, Mukul Chandrakant" Date: Fri, 26 Jan 2024 14:21:26 -0700 Subject: [PATCH] Revert "Squashed commit of the following:" This reverts commit 31626baef1909913fe5899813570f9e78cb63a4f. Earlier commit f54e85f missed out the discarded reverted changes relating to the vulnerability fixes. Hence removing them in these. --- .docker/setup_config.sh | 7 ++----- Dockerfile | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.docker/setup_config.sh b/.docker/setup_config.sh index 05456eea1..63f034406 100644 --- a/.docker/setup_config.sh +++ b/.docker/setup_config.sh @@ -13,24 +13,21 @@ source setup/setup.sh ## 10/02 - Mukul ## - Above comments talk about manually updating cryptography to version 40 ## - I have upgraded to 41.0.4 as per latest vulnerability fixes. -conda install -c conda-forge cryptography=41.0.7 wheel=0.40.0 +conda install -c conda-forge cryptography=41.0.4 wheel=0.40.0 ## Remove the old, unused packages to avoid tripping up the checker rm -rf /root/miniconda-23.1.0/pkgs/cryptography-38.0.4-py39h9ce1e76_0 rm -rf /root/miniconda-23.1.0/pkgs/wheel-0.37.1-pyhd3eb1b0_0 rm -rf /root/miniconda-23.5.2/pkgs/cryptography-39.0.1-py39h9ce1e76_2 rm -rf /root/miniconda-23.5.2/pkgs/certifi-2023.5.7-py39h06a4308_0 -rm -rf /root/miniconda-23.5.2/pkgs/conda-23.5.2-py39h06a4308_0/lib/python3.9/site-packages/tests +rm -rf /root/miniconda-23.5.2/pkgs/conda-23.5.2-py39h06a4308_0/lib/python3.9/site-packages/tests/ rm -rf /root/miniconda-23.5.2/pkgs/urllib3-1.26.16-py39h06a4308_0 rm -rf /root/miniconda-23.5.2/pkgs/urllib3-1.26.17-pyhd8ed1ab_0 rm -rf /root/miniconda-23.5.2/envs/emission/lib/python3.9/site-packages/urllib3-1.26.17.dist-info -rm -rf /root/miniconda-23.5.2/lib/python3.9/site-packages/urllib3-1.26.16.dist-info -rm -rf /root/miniconda-23.5.2/lib/python3.9/site-packages/tests # Clean up the conda install conda clean -t find /root/miniconda-*/pkgs -wholename \*info/test\* -type d | xargs rm -rf -find ~/miniconda-23.5.2 -name \*tests\* -path '*/site-packages/*' | grep ".*/site-packages/tests" | xargs rm -rf if [ -d "webapp/www/" ]; then cp /index.html webapp/www/index.html diff --git a/Dockerfile b/Dockerfile index 7fa923ea0..9ede21298 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # python 3 -FROM ubuntu:jammy-20231211.1 +FROM ubuntu:jammy-20231004 MAINTAINER K. Shankari (shankari@eecs.berkeley.edu)