From e24aaa06789318f0650f6d79be158edbaa6875b6 Mon Sep 17 00:00:00 2001 From: Scott Carda Date: Wed, 23 Aug 2023 11:50:12 -0700 Subject: [PATCH 1/5] update certifi and cryptography --- images/test-environments/linux/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/test-environments/linux/Dockerfile b/images/test-environments/linux/Dockerfile index 530faaaa90..2951c47345 100644 --- a/images/test-environments/linux/Dockerfile +++ b/images/test-environments/linux/Dockerfile @@ -13,6 +13,9 @@ ARG OS_TYPE RUN curl -LO "http://repo.continuum.io/miniconda/Miniconda3-${CONDA_VER}-Linux-${OS_TYPE}.sh" && \ bash Miniconda3-${CONDA_VER}-Linux-${OS_TYPE}.sh -p /miniconda -b && \ rm Miniconda3-${CONDA_VER}-Linux-${OS_TYPE}.sh + +RUN ./miniconda/bin/conda update -y certifi +RUN ./miniconda/bin/conda update -y cryptography ARG UBUNTU_VER # Download the Microsoft repository GPG keys From bd38d3c06608db398025e7c54afe959278988014 Mon Sep 17 00:00:00 2001 From: Scott Carda Date: Wed, 23 Aug 2023 16:01:27 -0700 Subject: [PATCH 2/5] remove unnecessary command --- images/test-environments/linux/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/test-environments/linux/Dockerfile b/images/test-environments/linux/Dockerfile index 2951c47345..df37d2f7c7 100644 --- a/images/test-environments/linux/Dockerfile +++ b/images/test-environments/linux/Dockerfile @@ -13,8 +13,7 @@ ARG OS_TYPE RUN curl -LO "http://repo.continuum.io/miniconda/Miniconda3-${CONDA_VER}-Linux-${OS_TYPE}.sh" && \ bash Miniconda3-${CONDA_VER}-Linux-${OS_TYPE}.sh -p /miniconda -b && \ rm Miniconda3-${CONDA_VER}-Linux-${OS_TYPE}.sh - -RUN ./miniconda/bin/conda update -y certifi + RUN ./miniconda/bin/conda update -y cryptography ARG UBUNTU_VER From c64949bb3e665661830746bafdbbc9acbd3f711a Mon Sep 17 00:00:00 2001 From: Scott Carda Date: Wed, 30 Aug 2023 15:04:49 -0700 Subject: [PATCH 3/5] update certifi instead of cryptography --- images/test-environments/linux/Dockerfile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/images/test-environments/linux/Dockerfile b/images/test-environments/linux/Dockerfile index df37d2f7c7..3b4a1da466 100644 --- a/images/test-environments/linux/Dockerfile +++ b/images/test-environments/linux/Dockerfile @@ -14,7 +14,7 @@ RUN curl -LO "http://repo.continuum.io/miniconda/Miniconda3-${CONDA_VER}-Linux-$ bash Miniconda3-${CONDA_VER}-Linux-${OS_TYPE}.sh -p /miniconda -b && \ rm Miniconda3-${CONDA_VER}-Linux-${OS_TYPE}.sh -RUN ./miniconda/bin/conda update -y cryptography +RUN ./miniconda/bin/conda update -y certifi ARG UBUNTU_VER # Download the Microsoft repository GPG keys @@ -26,16 +26,16 @@ ARG DEBIAN_FRONTEND=noninteractive # Update the list of packages after we added packages.microsoft.com RUN apt-get update && \ apt-get -y install \ - git \ - powershell \ - # install the below packages to pick up the latest security patch - logsave \ - libext2fs2 \ - libss2 \ - libcom-err2 \ - e2fsprogs \ - libssl1.1 \ - openssl && \ + git \ + powershell \ + # install the below packages to pick up the latest security patch + logsave \ + libext2fs2 \ + libss2 \ + libcom-err2 \ + e2fsprogs \ + libssl1.1 \ + openssl && \ # We clean the apt cache at the end of each apt command so that the caches # don't get stored in each layer. apt-get clean && rm -rf /var/lib/apt/lists/ From fd52962fedc2f327c16e436d34b4151151c77893 Mon Sep 17 00:00:00 2001 From: Scott Carda Date: Wed, 30 Aug 2023 15:10:42 -0700 Subject: [PATCH 4/5] fix spacing --- images/test-environments/linux/Dockerfile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/images/test-environments/linux/Dockerfile b/images/test-environments/linux/Dockerfile index 3b4a1da466..8d5d3fd26f 100644 --- a/images/test-environments/linux/Dockerfile +++ b/images/test-environments/linux/Dockerfile @@ -26,16 +26,16 @@ ARG DEBIAN_FRONTEND=noninteractive # Update the list of packages after we added packages.microsoft.com RUN apt-get update && \ apt-get -y install \ - git \ - powershell \ - # install the below packages to pick up the latest security patch - logsave \ - libext2fs2 \ - libss2 \ - libcom-err2 \ - e2fsprogs \ - libssl1.1 \ - openssl && \ + git \ + powershell \ + # install the below packages to pick up the latest security patch + logsave \ + libext2fs2 \ + libss2 \ + libcom-err2 \ + e2fsprogs \ + libssl1.1 \ + openssl && \ # We clean the apt cache at the end of each apt command so that the caches # don't get stored in each layer. apt-get clean && rm -rf /var/lib/apt/lists/ From ed01317a8faacf1d460825c6c48275f93a47eed5 Mon Sep 17 00:00:00 2001 From: Dmitry Vasilevsky Date: Wed, 30 Aug 2023 20:46:13 -0700 Subject: [PATCH 5/5] Empty commit to rebuild