feat: switch librarian to fork

jpatigny · Oct 16, 2024 · 65c98a1 · 65c98a1
1 parent 62d7df2
commit 65c98a1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/puppet/dockerfile6 b/puppet/dockerfile6
@@ -8,7 +8,7 @@ COPY ./puppet/helpers.ps1 C:/temp/helpers.ps1
 
 ARG PUPPET_AGENT_VERSION=6.28.0
 ARG PDK_VERSION=3.2.0.1
-ARG RUBY_VERSION=3.3.4-1
+ARG RUBY_VERSION=3.3.1-1
 ARG PWSH_VERSION=7.4.5
 
 RUN Set-ItemProperty 'HKLM:\System\CurrentControlSet\Control\FileSystem' -Name 'LongPathsEnabled' -Value 1 ; \
@@ -24,10 +24,11 @@ RUN Set-ItemProperty 'HKLM:\System\CurrentControlSet\Control\FileSystem' -Name '
     Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force ; \
     Install-Module -Name Pester -Force -SkipPublisherCheck ; \
     [System.Environment]::SetEnvironmentVariable('PDK_DISABLE_ANALYTICS', 'true', [EnvironmentVariableTarget]::Machine) ; \
-    Start-Process -FilePath C:\temp\rubyinstaller.exe -ArgumentList '/verysilent /currentuser' -Wait  ; \
+    Start-Process -FilePath C:\temp\rubyinstaller.exe -ArgumentList '/verysilent /currentuser /tasks=\"assocfiles,noridkinsall,modpath\"' -Wait  ; \
     Remove-Item C:\temp -Force -Recurse
 
-RUN gem install librarian-puppet -v 5.0.0
+RUN gem install specific_install ; \
+    gem specific_install https://github.com/jpatigny/librarian-puppet.git
 
 WORKDIR C:/puppet
 CMD [ "pwsh.exe", "-NoLogo", "-NoProfileLoadTime" ]
diff --git a/puppet/dockerfile8 b/puppet/dockerfile8
@@ -8,7 +8,7 @@ COPY ./puppet/helpers.ps1 C:/temp/helpers.ps1
 
 ARG PUPPET_AGENT_VERSION=8.6.0
 ARG PDK_VERSION=3.2.0.1
-ARG RUBY_VERSION=3.3.4-1
+ARG RUBY_VERSION=3.3.1-1
 ARG PWSH_VERSION=7.4.5
 
 RUN Set-ItemProperty 'HKLM:\System\CurrentControlSet\Control\FileSystem' -Name 'LongPathsEnabled' -Value 1 ; \
@@ -27,7 +27,8 @@ RUN Set-ItemProperty 'HKLM:\System\CurrentControlSet\Control\FileSystem' -Name '
     Start-Process -FilePath C:\temp\rubyinstaller.exe -ArgumentList '/verysilent /currentuser' -Wait  ; \
     Remove-Item C:\temp -Force -Recurse
 
-RUN gem install librarian-puppet -v 5.0.0
+RUN gem install specific_install ; \
+    gem specific_install https://github.com/jpatigny/librarian-puppet.git
 
 WORKDIR C:/puppet
 CMD [ "pwsh.exe", "-NoLogo", "-NoProfileLoadTime" ]