feat: Simplifying Dockerfile and Improving Container.init ( Fixes 2bitdesigns#74, Fixes 2bitdesigns#75 )

Author: James Brundage

Container.init.ps1

@@ -23,7 +23,6 @@
     (this does nothing, but most likely will be used in the future)
 #>
 using namespace 'mcr.microsoft.com/powershell AS powerShell'
-using namespace 'ruby:3.3.5-slim-bullseye AS jekyllrb'
 
 param(
 # The name of the module to be installed.
@@ -37,60 +36,76 @@ param(
     }
 ),
 # The packages to be installed.
-[string[]]$InstallPackages = @(
-    if ($env:InstallPackages) { $env:InstallPackages -split ',' }    
-),
+[string[]]$InstallAptGet = @($env:InstallAptGet -split ','),
 # The modules to be installed.
-[string[]]$InstallModules = @(
-    if ($env:InstallModules) { $env:InstallModules -split ',' }    
-    else {  }
-)
-)
+[string[]]$InstallModule = @($env:InstallModule -split ','),
+# The Ruby gems to be installed.
+[string[]]$InstallRubyGem = @($env:InstallRubyGem -split ','),
 
-
-# Get the root module directory
-$rootModuleDirectory = @($env:PSModulePath -split '[;:]')[0]
-
-# Determine the path to the module destination. 
-$moduleDestination = "$rootModuleDirectory/$ModuleName"
-# Copy the module to the destination
-# (this is being used instead of the COPY statement in Docker, to avoid additional layers).
-Copy-Item -Path "$psScriptRoot" -Destination $moduleDestination -Recurse -Force
+# If set, will keep the .git directories.
+[switch]$KeepGit = $($env:KeepGit -match $true)
+)
 
 # Copy all container-related scripts to the root of the container.
 Get-ChildItem -Path $PSScriptRoot | 
     Where-Object Name -Match '^Container\..+?\.ps1$' | 
     Copy-Item -Destination /
 
-# If we have packages to install
-if ($InstallPackages) {
-    # install the packages
-    apt-get update && apt-get install -y @InstallPackages '--no-install-recommends' && apt-get clean | Out-Host
-}
+# Create a profile
+New-Item -Path $Profile -ItemType File -Force | Out-Null
+
+if ($ModuleName) {
+    # Get the root module directory
+    $rootModuleDirectory = @($env:PSModulePath -split '[;:]')[0]
+
+    # Determine the path to the module destination. 
+    $moduleDestination = "$rootModuleDirectory/$ModuleName"
+    # Copy the module to the destination
+    # (this is being used instead of the COPY statement in Docker, to avoid additional layers).
+    Copy-Item -Path "$psScriptRoot" -Destination $moduleDestination -Recurse -Force
 
-# Create a new profile
-New-Item -Path $Profile -ItemType File -Force |
     # and import this module in the profile
-    Add-Content -Value "Import-Module $ModuleName" -Force
+    Add-Content -Path $profile -Value "Import-Module $ModuleName" -Force
+}
+
 # If we have modules to install
-if ($InstallModules) { 
+if ($InstallModule) { 
     # Install the modules
-    Install-Module -Name $InstallModules -Force -AcceptLicense -Scope CurrentUser 
+    Install-Module -Name $InstallModule -Force -AcceptLicense -Scope CurrentUser
     # and import them in the profile
-    Add-Content -Path $Profile -Value "Import-Module '$($InstallModules -join "','")'" -Force
+    Add-Content -Path $Profile -Value "Import-Module '$($InstallModule -join "','")'" -Force
+}
+
+# If we have packages to install
+if ($InstallAptGet) {
+    # install the packages
+    apt-get update && 
+        apt-get install -y @InstallAptGet '--no-install-recommends' && 
+            apt-get clean |
+                Out-Host
 }
-# In our profile, push into the module's directory
-Add-Content -Path $Profile -Value "Get-Module $ModuleName | Split-Path | Push-Location" -Force
 
-# Remove the .git directories from any modules
-Get-ChildItem -Path $rootModuleDirectory -Directory -Force -Recurse |
-    Where-Object Name -eq '.git' |
-    Remove-Item -Recurse -Force
+if ($InstallRubyGem) {
+    # Install the Ruby gems
+    gem install @InstallRubyGem
+}
+
+if ($ModuleName) {
+    # In our profile, push into the module's directory
+    Add-Content -Path $Profile -Value "Get-Module $ModuleName | Split-Path | Push-Location" -Force
+}
+
+if (-not $KeepGit) {
+    # Remove the .git directories from any modules
+    Get-ChildItem -Path $rootModuleDirectory -Directory -Force -Recurse |
+        Where-Object Name -eq '.git' |
+        Remove-Item -Recurse -Force
+}
 
 # Congratulations! You have successfully initialized the container image.
 # This script should work in about any module, with minor adjustments.
 # If you have any adjustments, please put them below here, in the `#region Custom`
 
 #region Custom
-gem install jekyll
+bundle config --global silence_root_warning true
 #endregion Custom

Dockerfile

@@ -1,19 +1,11 @@
 # Thank you Microsoft!  Thank you PowerShell!  Thank you Docker!
 FROM mcr.microsoft.com/powershell AS powershell
 
-FROM ruby:3.3.5-slim-bullseye AS jekyllrb
-
-# Copy the module into the container
-# Copy essentially everything from the PowerShell image into the final image
-COPY --from=powershell /usr /usr
-COPY --from=powershell /lib /lib
-COPY --from=powershell /lib64 /lib64
-COPY --from=powershell /bin /bin
-COPY --from=powershell /opt /opt
-
 # Set the module name to the name of the module we are building
 ENV ModuleName=4bitcss
-ENV InstallPackages="build-essential","git"
+ENV InstallAptGet="build-essential","ruby-full","bundler","git","curl","ca-certificates","libc6","libgcc1"
+ENV InstallModule="ugit","PSJekyll"
+ENV InstallRubyGem="jekyll"
 
 # Copy the module into the container
 RUN --mount=type=bind,src=./,target=/Initialize /bin/pwsh -nologo -command /Initialize/Container.init.ps1