Merge pull request #37 from theohbrothers/enhancement/enhance-docker-…

…entrypoint.sh-with-pwsh-flag-detection-with-fallback-on-binary Enhancement: Enhance `/docker-entrypoint.sh` with `pwsh` flag detection with fallback on binary
theohbrothers · Jun 30, 2023 · afda9a4 · afda9a4
2 parents 37c60ce + ba00f93
commit afda9a4
Show file tree

Hide file tree

Showing 55 changed files with 338 additions and 0 deletions.
diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1
@@ -62,6 +62,14 @@ $VARIANTS_SHARED = @{
                     }
                 )
             }
+            'docker-entrypoint.sh' = @{
+                common = $true
+                passes = @(
+                    @{
+                        variables = @{}
+                    }
+                )
+            }
         }
     }
 }
diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1
@@ -91,3 +91,11 @@ RUN set -eux; \
         throw "Only alpine and ubuntu base image tags supported"
     }
 }
+
+@"
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
+
+"@
diff --git a/generate/templates/docker-entrypoint.sh.ps1 b/generate/templates/docker-entrypoint.sh.ps1
@@ -0,0 +1,10 @@
+@'
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
+'@
diff --git a/variants/6.0.2-ubuntu-16.04-git-sops/Dockerfile b/variants/6.0.2-ubuntu-16.04-git-sops/Dockerfile
@@ -38,3 +38,7 @@ RUN set -eux; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/6.0.2-ubuntu-16.04-git-sops/docker-entrypoint.sh b/variants/6.0.2-ubuntu-16.04-git-sops/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
diff --git a/variants/6.0.2-ubuntu-16.04/Dockerfile b/variants/6.0.2-ubuntu-16.04/Dockerfile
@@ -13,3 +13,7 @@ ENV COMPlus_EnableDiagnostics=0
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/6.0.2-ubuntu-16.04/docker-entrypoint.sh b/variants/6.0.2-ubuntu-16.04/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
diff --git a/variants/6.1.3-alpine-3.8-git-sops/Dockerfile b/variants/6.1.3-alpine-3.8-git-sops/Dockerfile
@@ -23,3 +23,7 @@ RUN set -eux; \
 
 RUN apk add --no-cache gnupg
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/6.1.3-alpine-3.8-git-sops/docker-entrypoint.sh b/variants/6.1.3-alpine-3.8-git-sops/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
diff --git a/variants/6.1.3-alpine-3.8/Dockerfile b/variants/6.1.3-alpine-3.8/Dockerfile
@@ -13,3 +13,7 @@ ENV COMPlus_EnableDiagnostics=0
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/6.1.3-alpine-3.8/docker-entrypoint.sh b/variants/6.1.3-alpine-3.8/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
diff --git a/variants/6.1.3-ubuntu-18.04-git-sops/Dockerfile b/variants/6.1.3-ubuntu-18.04-git-sops/Dockerfile
@@ -38,3 +38,7 @@ RUN set -eux; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/6.1.3-ubuntu-18.04-git-sops/docker-entrypoint.sh b/variants/6.1.3-ubuntu-18.04-git-sops/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
diff --git a/variants/6.1.3-ubuntu-18.04/Dockerfile b/variants/6.1.3-ubuntu-18.04/Dockerfile
@@ -13,3 +13,7 @@ ENV COMPlus_EnableDiagnostics=0
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/6.1.3-ubuntu-18.04/docker-entrypoint.sh b/variants/6.1.3-ubuntu-18.04/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
diff --git a/variants/6.2.4-alpine-3.8-git-sops/Dockerfile b/variants/6.2.4-alpine-3.8-git-sops/Dockerfile
@@ -23,3 +23,7 @@ RUN set -eux; \
 
 RUN apk add --no-cache gnupg
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/6.2.4-alpine-3.8-git-sops/docker-entrypoint.sh b/variants/6.2.4-alpine-3.8-git-sops/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
diff --git a/variants/6.2.4-alpine-3.8/Dockerfile b/variants/6.2.4-alpine-3.8/Dockerfile
@@ -13,3 +13,7 @@ ENV COMPlus_EnableDiagnostics=0
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/6.2.4-alpine-3.8/docker-entrypoint.sh b/variants/6.2.4-alpine-3.8/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
diff --git a/variants/6.2.4-ubuntu-18.04-git-sops/Dockerfile b/variants/6.2.4-ubuntu-18.04-git-sops/Dockerfile
@@ -38,3 +38,7 @@ RUN set -eux; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/6.2.4-ubuntu-18.04-git-sops/docker-entrypoint.sh b/variants/6.2.4-ubuntu-18.04-git-sops/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
diff --git a/variants/6.2.4-ubuntu-18.04/Dockerfile b/variants/6.2.4-ubuntu-18.04/Dockerfile
@@ -13,3 +13,7 @@ ENV COMPlus_EnableDiagnostics=0
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/6.2.4-ubuntu-18.04/docker-entrypoint.sh b/variants/6.2.4-ubuntu-18.04/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
diff --git a/variants/7.0.3-alpine-3.9-git-sops/Dockerfile b/variants/7.0.3-alpine-3.9-git-sops/Dockerfile
@@ -23,3 +23,7 @@ RUN set -eux; \
 
 RUN apk add --no-cache gnupg
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.0.3-alpine-3.9-git-sops/docker-entrypoint.sh b/variants/7.0.3-alpine-3.9-git-sops/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
diff --git a/variants/7.0.3-alpine-3.9/Dockerfile b/variants/7.0.3-alpine-3.9/Dockerfile
@@ -13,3 +13,7 @@ ENV COMPlus_EnableDiagnostics=0
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.0.3-alpine-3.9/docker-entrypoint.sh b/variants/7.0.3-alpine-3.9/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
diff --git a/variants/7.0.3-ubuntu-18.04-git-sops/Dockerfile b/variants/7.0.3-ubuntu-18.04-git-sops/Dockerfile
@@ -38,3 +38,7 @@ RUN set -eux; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.0.3-ubuntu-18.04-git-sops/docker-entrypoint.sh b/variants/7.0.3-ubuntu-18.04-git-sops/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
diff --git a/variants/7.0.3-ubuntu-18.04/Dockerfile b/variants/7.0.3-ubuntu-18.04/Dockerfile
@@ -13,3 +13,7 @@ ENV COMPlus_EnableDiagnostics=0
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.0.3-ubuntu-18.04/docker-entrypoint.sh b/variants/7.0.3-ubuntu-18.04/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
diff --git a/variants/7.1.5-alpine-3.13-git-sops/Dockerfile b/variants/7.1.5-alpine-3.13-git-sops/Dockerfile
@@ -23,3 +23,7 @@ RUN set -eux; \
 
 RUN apk add --no-cache gnupg
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.1.5-alpine-3.13-git-sops/docker-entrypoint.sh b/variants/7.1.5-alpine-3.13-git-sops/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
diff --git a/variants/7.1.5-alpine-3.13/Dockerfile b/variants/7.1.5-alpine-3.13/Dockerfile
@@ -13,3 +13,7 @@ ENV COMPlus_EnableDiagnostics=0
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.1.5-alpine-3.13/docker-entrypoint.sh b/variants/7.1.5-alpine-3.13/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
diff --git a/variants/7.1.5-ubuntu-20.04-git-sops/Dockerfile b/variants/7.1.5-ubuntu-20.04-git-sops/Dockerfile
@@ -38,3 +38,7 @@ RUN set -eux; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.1.5-ubuntu-20.04-git-sops/docker-entrypoint.sh b/variants/7.1.5-ubuntu-20.04-git-sops/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
diff --git a/variants/7.1.5-ubuntu-20.04/Dockerfile b/variants/7.1.5-ubuntu-20.04/Dockerfile
@@ -13,3 +13,7 @@ ENV COMPlus_EnableDiagnostics=0
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.1.5-ubuntu-20.04/docker-entrypoint.sh b/variants/7.1.5-ubuntu-20.04/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
diff --git a/variants/7.2.2-alpine-3.14-git-sops/Dockerfile b/variants/7.2.2-alpine-3.14-git-sops/Dockerfile
@@ -23,3 +23,7 @@ RUN set -eux; \
 
 RUN apk add --no-cache gnupg
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.2.2-alpine-3.14-git-sops/docker-entrypoint.sh b/variants/7.2.2-alpine-3.14-git-sops/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
diff --git a/variants/7.2.2-alpine-3.14/Dockerfile b/variants/7.2.2-alpine-3.14/Dockerfile
@@ -13,3 +13,7 @@ ENV COMPlus_EnableDiagnostics=0
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
 RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
 
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.2.2-alpine-3.14/docker-entrypoint.sh b/variants/7.2.2-alpine-3.14/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"