From 7995d5d35600b097ab17050c4a91a85aa9d03c33 Mon Sep 17 00:00:00 2001 From: Clara Berendsen Date: Fri, 26 Jan 2024 09:45:25 -0300 Subject: [PATCH 1/8] Revert "Pin chocolatey version to 1.4.0" --- windows_docker_resources/Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/windows_docker_resources/Dockerfile b/windows_docker_resources/Dockerfile index ecdb64527..4cbf20c71 100644 --- a/windows_docker_resources/Dockerfile +++ b/windows_docker_resources/Dockerfile @@ -20,6 +20,7 @@ FROM mcr.microsoft.com/windows/server:$WINDOWS_RELEASE_VERSION # Install cinc-solo, a compiled binary of chef-solo RUN powershell "iex ((New-Object System.Net.WebClient).DownloadString('https://omnitruck.cinc.sh/install.ps1')); install -version 16.15.22" + # Update certificate bundle to work Let's Encrypt root certificate expiration # https://www.openssl.org/blog/blog/2021/09/13/LetsEncryptRootCertExpire/ # (in the parlance of the above post we're using workaround 1) @@ -29,11 +30,7 @@ COPY cacert.pem c:\cinc-project\cinc\embedded\ssl\certs\cacert.pem COPY cacert.pem c:\cinc-project\cinc\embedded\lib\ruby\gems\2.7.0\gems\httpclient-2.8.3\lib\httpclient\cacert.pem # Install Chocolatey by powershell script - -# Pining chocolatey version to 1.4.0 previous one to major bump to 2.0.0 due to issues with chocolatey_package chef resource -# See https://github.com/chef/chef/issues/13751 for more detail of the issue -# This should be solved for chef version 18; see https://github.com/chef/chef/pull/13833 -RUN powershell -noexit "$env:chocolateyDownloadUrl = 'https://community.chocolatey.org/api/v2/package/chocolatey/1.4.0'; Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" +RUN powershell -noexit "Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" # choco installs. chef-workstation is being installed to get berks and download cookbook dependencies RUN choco install -y git chef-workstation From 330f23add7beefe1f64b7a935fcded7ac14c640c Mon Sep 17 00:00:00 2001 From: claraberendsen Date: Fri, 26 Jan 2024 10:41:46 -0300 Subject: [PATCH 2/8] move to chef 18 --- windows_docker_resources/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/windows_docker_resources/Dockerfile b/windows_docker_resources/Dockerfile index 4cbf20c71..4d952e742 100644 --- a/windows_docker_resources/Dockerfile +++ b/windows_docker_resources/Dockerfile @@ -19,8 +19,7 @@ ARG WINDOWS_RELEASE_VERSION=$WINDOWS_RELEASE_ID FROM mcr.microsoft.com/windows/server:$WINDOWS_RELEASE_VERSION # Install cinc-solo, a compiled binary of chef-solo -RUN powershell "iex ((New-Object System.Net.WebClient).DownloadString('https://omnitruck.cinc.sh/install.ps1')); install -version 16.15.22" - +RUN powershell "iex ((New-Object System.Net.WebClient).DownloadString('https://omnitruck.cinc.sh/install.ps1')); install -version 18" # Update certificate bundle to work Let's Encrypt root certificate expiration # https://www.openssl.org/blog/blog/2021/09/13/LetsEncryptRootCertExpire/ # (in the parlance of the above post we're using workaround 1) From 151d349c70118556cf8999dcc4cccd6dbe86dda8 Mon Sep 17 00:00:00 2001 From: claraberendsen Date: Tue, 6 Feb 2024 11:46:14 -0300 Subject: [PATCH 3/8] update reference to custom branch of ros2-cookbooks --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index d13fd6b59..b7c8b5dcf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,4 +20,4 @@ [submodule "windows_docker_resources/ros2-cookbooks"] path = windows_docker_resources/ros2-cookbooks url = git@github.com:ros-infrastructure/ros2-cookbooks - branch = latest + branch = claraberendsen/unpin-seven-zip From 5ab92c3b25c7ed5bb850f8540ad662718a03d729 Mon Sep 17 00:00:00 2001 From: claraberendsen Date: Tue, 6 Feb 2024 12:24:40 -0300 Subject: [PATCH 4/8] update ros2-cookbooks to custom branch --- windows_docker_resources/ros2-cookbooks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_docker_resources/ros2-cookbooks b/windows_docker_resources/ros2-cookbooks index 8af8a662c..a0e49c2c9 160000 --- a/windows_docker_resources/ros2-cookbooks +++ b/windows_docker_resources/ros2-cookbooks @@ -1 +1 @@ -Subproject commit 8af8a662cf4757d2171d66636fd52ed1883b0d20 +Subproject commit a0e49c2c972b38495d42c8cde86639d6b170fc84 From 6f9d25a4d614ca60419b610d3dac4e1e539c01b3 Mon Sep 17 00:00:00 2001 From: claraberendsen Date: Tue, 6 Feb 2024 12:25:33 -0300 Subject: [PATCH 5/8] pin to cinc to 18.3 --- windows_docker_resources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_docker_resources/Dockerfile b/windows_docker_resources/Dockerfile index 4d952e742..4552c8589 100644 --- a/windows_docker_resources/Dockerfile +++ b/windows_docker_resources/Dockerfile @@ -19,7 +19,7 @@ ARG WINDOWS_RELEASE_VERSION=$WINDOWS_RELEASE_ID FROM mcr.microsoft.com/windows/server:$WINDOWS_RELEASE_VERSION # Install cinc-solo, a compiled binary of chef-solo -RUN powershell "iex ((New-Object System.Net.WebClient).DownloadString('https://omnitruck.cinc.sh/install.ps1')); install -version 18" +RUN powershell "iex ((New-Object System.Net.WebClient).DownloadString('https://omnitruck.cinc.sh/install.ps1')); install -version 18.3" # Update certificate bundle to work Let's Encrypt root certificate expiration # https://www.openssl.org/blog/blog/2021/09/13/LetsEncryptRootCertExpire/ # (in the parlance of the above post we're using workaround 1) From 9433eaaa817c87804ab797cba225c2e5513e583d Mon Sep 17 00:00:00 2001 From: claraberendsen Date: Tue, 6 Feb 2024 16:57:56 -0300 Subject: [PATCH 6/8] update cookbook commit --- windows_docker_resources/ros2-cookbooks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_docker_resources/ros2-cookbooks b/windows_docker_resources/ros2-cookbooks index a0e49c2c9..54e932e86 160000 --- a/windows_docker_resources/ros2-cookbooks +++ b/windows_docker_resources/ros2-cookbooks @@ -1 +1 @@ -Subproject commit a0e49c2c972b38495d42c8cde86639d6b170fc84 +Subproject commit 54e932e8659d7062605907b4b7a7ed23b9d6c308 From beed170d7dca8b9cba5db686952fc405384557e8 Mon Sep 17 00:00:00 2001 From: claraberendsen Date: Tue, 6 Feb 2024 19:10:43 -0300 Subject: [PATCH 7/8] change ros2-cookbook commit --- windows_docker_resources/ros2-cookbooks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_docker_resources/ros2-cookbooks b/windows_docker_resources/ros2-cookbooks index 54e932e86..14021f167 160000 --- a/windows_docker_resources/ros2-cookbooks +++ b/windows_docker_resources/ros2-cookbooks @@ -1 +1 @@ -Subproject commit 54e932e8659d7062605907b4b7a7ed23b9d6c308 +Subproject commit 14021f16723adc353c78076abbbbf63eeef04dfc From b26baf879a1e2273ea499619b717b5c0857ab6b7 Mon Sep 17 00:00:00 2001 From: claraberendsen Date: Wed, 7 Feb 2024 14:44:52 -0300 Subject: [PATCH 8/8] update reference --- windows_docker_resources/ros2-cookbooks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_docker_resources/ros2-cookbooks b/windows_docker_resources/ros2-cookbooks index 14021f167..8714afff1 160000 --- a/windows_docker_resources/ros2-cookbooks +++ b/windows_docker_resources/ros2-cookbooks @@ -1 +1 @@ -Subproject commit 14021f16723adc353c78076abbbbf63eeef04dfc +Subproject commit 8714afff1850c9fad9b0d22af3f7f6cbc975570d