@@ -19,13 +19,21 @@ ARG WINDOWS_RELEASE_VERSION=$WINDOWS_RELEASE_ID
1919FROM mcr.microsoft.com/windows:$WINDOWS_RELEASE_VERSION
2020
2121# Install cinc-solo, a compiled binary of chef-solo
22- RUN powershell "iex ((New-Object System.Net.WebClient).DownloadString('https://omnitruck.cinc.sh/install.ps1')); install -version 15.10.12"
22+ RUN powershell "iex ((New-Object System.Net.WebClient).DownloadString('https://omnitruck.cinc.sh/install.ps1')); install -version 16.15.22"
23+
24+ # Update certificate bundle to work Let's Encrypt root certificate expiration
25+ # https://www.openssl.org/blog/blog/2021/09/13/LetsEncryptRootCertExpire/
26+ # (in the parlance of the above post we're using workaround 1)
27+ # This workaround is being incorporated directly in future releases of Cinc 16 and 17.
28+ # Our application of the work around should be removed when updating to such a version.
29+ COPY cacert.pem c:\c inc-project\c inc\e mbedded\s sl\c erts\c acert.pem
30+ COPY cacert.pem c:\c inc-project\c inc\e mbedded\l ib\r uby\g ems\2 .7.0\g ems\h ttpclient-2.8.3\l ib\h ttpclient\c acert.pem
2331
2432# Install Chocolatey by powershell script
2533RUN powershell -noexit "Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))"
2634
27- # choco installs. chefdk is being installed to get berks and download cookbook dependencies
28- RUN choco install -y git chefdk
35+ # choco installs. chef-workstation is being installed to get berks and download cookbook dependencies
36+ RUN choco install -y git chef-workstation
2937
3038# Copy over necessary files into container
3139RUN IF NOT EXIST "C:\T EMP" mkdir C:\T EMP
@@ -45,7 +53,7 @@ COPY qtaccount\ros2ci.rb C:\TEMP\environments\ros2ci.rb
4553
4654# Download vendor cookbooks
4755WORKDIR C:\T EMP\r os2-cookbooks\c ookbooks\r os2_windows
48- RUN C:\o pscode\c hefdk \b in\b erks vendor C:\T EMP\r os2-cookbooks\c ookbooks
56+ RUN C:\o pscode\c hef-workstation \b in\b erks vendor C:\T EMP\r os2-cookbooks\c ookbooks
4957
5058# Initial run
5159RUN c:\c inc-project\c inc\b in\c inc-solo.bat -c C:\T EMP\s olo.rb -Eros2ci -j C:\T EMP\i nstall_ros2_%ROS_DISTRO%.json
0 commit comments