[Ubuntu] don't install web servers

Inside container environment we're not running a second service process, but use service container for act instead. See: nektos/act#1949 Signed-off-by: You-Sheng Yang <vicamo@gmail.com>
vicamo · Mar 3, 2024 · 5c64cd7 · 5c64cd7
1 parent 86cf21d
commit 5c64cd7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/images/ubuntu/scripts/build/install-apache.sh b/images/ubuntu/scripts/build/install-apache.sh
@@ -4,6 +4,10 @@
 ##  Desc:  Install Apache HTTP Server
 ################################################################################
 
+if [[ -f /run/systemd/container ]]; then
+    exit 0
+fi
+
 # Install Apache
 apt-get install apache2 -y
 

diff --git a/images/ubuntu/scripts/build/install-nginx.sh b/images/ubuntu/scripts/build/install-nginx.sh
@@ -4,6 +4,10 @@
 ##  Desc:  Install Nginx
 ################################################################################
 
+if [[ -f /run/systemd/container ]]; then
+    exit 0
+fi
+
 # Install Nginx
 apt-get install nginx -y
 

diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
@@ -227,7 +227,9 @@ $powerShellTools = $installedSoftware.AddHeader("PowerShell Tools")
 $powerShellTools.AddToolVersion("PowerShell", $(Get-PowershellVersion))
 $powerShellTools.AddHeader("PowerShell Modules").AddNodes($(Get-PowerShellModules))
 
-$installedSoftware.AddHeader("Web Servers").AddTable($(Build-WebServersTable))
+if (-not (Test-IsContainer)) {
+    $installedSoftware.AddHeader("Web Servers").AddTable($(Build-WebServersTable))
+}
 
 $androidTools = $installedSoftware.AddHeader("Android")
 $androidTools.AddTable($(Build-AndroidTable))

diff --git a/images/ubuntu/scripts/tests/WebServers.Tests.ps1 b/images/ubuntu/scripts/tests/WebServers.Tests.ps1
@@ -1,4 +1,6 @@
-Describe "Apache" {
+Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
+
+Describe "Apache" -Skip:(Test-IsContainer) {
     It "Apache CLI" {
         "apache2 -v" | Should -ReturnZeroExitCode
     }
@@ -10,7 +12,7 @@ Describe "Apache" {
     }
 }
 
-Describe "Nginx" {
+Describe "Nginx" -Skip:(Test-IsContainer) {
     It "Nginx CLI" {
         "nginx -v" | Should -ReturnZeroExitCode
     }