Use snapshot version of msys2 for a while

This is a workaround not to stall with docker build.
fluent · Jun 30, 2021 · 1f81202 · 1f81202
1 parent 528824f
commit 1f81202
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/v1.13/windows-2004/Dockerfile b/v1.13/windows-2004/Dockerfile
@@ -10,8 +10,15 @@ LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1
 RUN powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))"
 
 # Fluentd depends on cool.io whose fat gem is only available for Ruby < 2.5, so need to specify --platform ruby when install Ruby > 2.5 and install msys2 to get dev tools
-RUN choco install -y ruby --version 2.6.5.1 --params "'/InstallDir:C:\ruby26'" \
-&& choco install -y msys2 --version 20210604.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby26\msys64'"
+#RUN choco install -y ruby --version 2.6.5.1 --params "'/InstallDir:C:\ruby26'" \
+#&& choco install -y msys2 --version 20210604.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby26\msys64'"
+
+# For avoiding stalling with docker build, we use snapshot version of msys2 until newer msys2 will be shipped.
+# NOTE: msys2 must be extracted to c:\ruby26\msys64. It should be done with -oC:\ruby26 option.
+RUN powershell -Command "Invoke-WebRequest 'https://github.com/msys2/msys2-installer/releases/download/nightly-x86_64/msys2-base-x86_64-20210628.sfx.exe' -OutFile 'msys2-base-x86_64-20210628.sfx.exe'" \
+&& choco install -y ruby --version 2.6.5.1 --params "'/InstallDir:C:\ruby26'" \
+&& msys2-base-x86_64-20210628.sfx.exe -y -oC:\ruby26
+
 RUN refreshenv \
 && ridk install 2 3 \
 && echo gem: --no-document >> C:\ProgramData\gemrc \

diff --git a/v1.13/windows-20H2/Dockerfile b/v1.13/windows-20H2/Dockerfile
@@ -10,8 +10,15 @@ LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1
 RUN powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))"
 
 # Fluentd depends on cool.io whose fat gem is only available for Ruby < 2.5, so need to specify --platform ruby when install Ruby > 2.5 and install msys2 to get dev tools
-RUN choco install -y ruby --version 2.6.5.1 --params "'/InstallDir:C:\ruby26'" \
-&& choco install -y msys2 --version 20210604.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby26\msys64'"
+#RUN choco install -y ruby --version 2.6.5.1 --params "'/InstallDir:C:\ruby26'" \
+#&& choco install -y msys2 --version 20210604.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby26\msys64'"
+
+# For avoiding stalling with docker build, we use snapshot version of msys2 until newer msys2 will be shipped.
+# NOTE: msys2 must be extracted to c:\ruby26\msys64. It should be done with -oC:\ruby26 option.
+RUN powershell -Command "Invoke-WebRequest 'https://github.com/msys2/msys2-installer/releases/download/nightly-x86_64/msys2-base-x86_64-20210628.sfx.exe' -OutFile 'msys2-base-x86_64-20210628.sfx.exe'" \
+&& choco install -y ruby --version 2.6.5.1 --params "'/InstallDir:C:\ruby26'" \
+&& msys2-base-x86_64-20210628.sfx.exe -y -oC:\ruby26
+
 RUN refreshenv \
 && ridk install 2 3 \
 && echo gem: --no-document >> C:\ProgramData\gemrc \

diff --git a/v1.13/windows-ltsc2019/Dockerfile b/v1.13/windows-ltsc2019/Dockerfile
@@ -10,8 +10,15 @@ LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1
 RUN powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))"
 
 # Fluentd depends on cool.io whose fat gem is only available for Ruby < 2.5, so need to specify --platform ruby when install Ruby > 2.5 and install msys2 to get dev tools
-RUN choco install -y ruby --version 2.6.5.1 --params "'/InstallDir:C:\ruby26'" \
-&& choco install -y msys2 --version 20210604.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby26\msys64'"
+#RUN choco install -y ruby --version 2.6.5.1 --params "'/InstallDir:C:\ruby26'" \
+#&& choco install -y msys2 --version 20210604.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby26\msys64'"
+
+# For avoiding stalling with docker build, we use snapshot version of msys2 until newer msys2 will be shipped.
+# NOTE: msys2 must be extracted to c:\ruby26\msys64. It should be done with -oC:\ruby26 option.
+RUN powershell -Command "Invoke-WebRequest 'https://github.com/msys2/msys2-installer/releases/download/nightly-x86_64/msys2-base-x86_64-20210628.sfx.exe' -OutFile 'msys2-base-x86_64-20210628.sfx.exe'" \
+&& choco install -y ruby --version 2.6.5.1 --params "'/InstallDir:C:\ruby26'" \
+&& msys2-base-x86_64-20210628.sfx.exe -y -oC:\ruby26
+
 RUN refreshenv \
 && ridk install 2 3 \
 && echo gem: --no-document >> C:\ProgramData\gemrc \