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

…entrypoint.sh-with-easyrsa-subcommand-detection-with-fallback-on-binary Enhancement: Enhance `/docker-entrypoint.sh` with `easyrsa` subcommand detection with fallback on binary
theohbrothers · Jun 30, 2023 · 9a6d93a · 9a6d93a
2 parents 67fed42 + 234c1d8
commit 9a6d93a
Show file tree

Hide file tree

Showing 15 changed files with 240 additions and 104 deletions.
diff --git a/generate/templates/docker-entrypoint.sh.ps1 b/generate/templates/docker-entrypoint.sh.ps1
@@ -1,13 +1,23 @@
 @'
 #!/bin/sh
+set -eu
 
-set -aeo pipefail
+if [ $# -gt 0 ]; then
+    # Get all subcommands. 'help' is also a subcommand
+    SUBCOMMANDS=$( ./easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    if echo "$SUBCOMMANDS" | grep "^$1$"; then
+        # Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
+        echo "Generating command line"
+        set "$EASYRSA/easyrsa" "$@"
 
-# Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
-echo "Generating command line"
-set "$EASYRSA/easyrsa" "$@"
+        # Exec
+        echo "easyrsa command line: $@"
+        exec "$@"
+    fi
+else
+    exec "$EASYRSA/easyrsa" "$@"
+fi
 
-# Exec
-echo "easyrsa command line: $@"
 exec "$@"
+
 '@
diff --git a/variants/v3.0.1-alpine-3.3/docker-entrypoint.sh b/variants/v3.0.1-alpine-3.3/docker-entrypoint.sh
@@ -1,11 +1,20 @@
 #!/bin/sh
+set -eu
 
-set -aeo pipefail
+if [ $# -gt 0 ]; then
+    # Get all subcommands. 'help' is also a subcommand
+    SUBCOMMANDS=$( ./easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    if echo "$SUBCOMMANDS" | grep "^$1$"; then
+        # Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
+        echo "Generating command line"
+        set "$EASYRSA/easyrsa" "$@"
 
-# Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
-echo "Generating command line"
-set "$EASYRSA/easyrsa" "$@"
+        # Exec
+        echo "easyrsa command line: $@"
+        exec "$@"
+    fi
+else
+    exec "$EASYRSA/easyrsa" "$@"
+fi
 
-# Exec
-echo "easyrsa command line: $@"
-exec "$@"
+exec "$@"
diff --git a/variants/v3.0.1-alpine-3.4/docker-entrypoint.sh b/variants/v3.0.1-alpine-3.4/docker-entrypoint.sh
@@ -1,11 +1,20 @@
 #!/bin/sh
+set -eu
 
-set -aeo pipefail
+if [ $# -gt 0 ]; then
+    # Get all subcommands. 'help' is also a subcommand
+    SUBCOMMANDS=$( ./easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    if echo "$SUBCOMMANDS" | grep "^$1$"; then
+        # Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
+        echo "Generating command line"
+        set "$EASYRSA/easyrsa" "$@"
 
-# Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
-echo "Generating command line"
-set "$EASYRSA/easyrsa" "$@"
+        # Exec
+        echo "easyrsa command line: $@"
+        exec "$@"
+    fi
+else
+    exec "$EASYRSA/easyrsa" "$@"
+fi
 
-# Exec
-echo "easyrsa command line: $@"
-exec "$@"
+exec "$@"
diff --git a/variants/v3.0.1-alpine-3.5/docker-entrypoint.sh b/variants/v3.0.1-alpine-3.5/docker-entrypoint.sh
@@ -1,11 +1,20 @@
 #!/bin/sh
+set -eu
 
-set -aeo pipefail
+if [ $# -gt 0 ]; then
+    # Get all subcommands. 'help' is also a subcommand
+    SUBCOMMANDS=$( ./easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    if echo "$SUBCOMMANDS" | grep "^$1$"; then
+        # Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
+        echo "Generating command line"
+        set "$EASYRSA/easyrsa" "$@"
 
-# Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
-echo "Generating command line"
-set "$EASYRSA/easyrsa" "$@"
+        # Exec
+        echo "easyrsa command line: $@"
+        exec "$@"
+    fi
+else
+    exec "$EASYRSA/easyrsa" "$@"
+fi
 
-# Exec
-echo "easyrsa command line: $@"
-exec "$@"
+exec "$@"
diff --git a/variants/v3.0.1-alpine-3.6/docker-entrypoint.sh b/variants/v3.0.1-alpine-3.6/docker-entrypoint.sh
@@ -1,11 +1,20 @@
 #!/bin/sh
+set -eu
 
-set -aeo pipefail
+if [ $# -gt 0 ]; then
+    # Get all subcommands. 'help' is also a subcommand
+    SUBCOMMANDS=$( ./easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    if echo "$SUBCOMMANDS" | grep "^$1$"; then
+        # Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
+        echo "Generating command line"
+        set "$EASYRSA/easyrsa" "$@"
 
-# Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
-echo "Generating command line"
-set "$EASYRSA/easyrsa" "$@"
+        # Exec
+        echo "easyrsa command line: $@"
+        exec "$@"
+    fi
+else
+    exec "$EASYRSA/easyrsa" "$@"
+fi
 
-# Exec
-echo "easyrsa command line: $@"
-exec "$@"
+exec "$@"
diff --git a/variants/v3.0.3-alpine-3.7/docker-entrypoint.sh b/variants/v3.0.3-alpine-3.7/docker-entrypoint.sh
@@ -1,11 +1,20 @@
 #!/bin/sh
+set -eu
 
-set -aeo pipefail
+if [ $# -gt 0 ]; then
+    # Get all subcommands. 'help' is also a subcommand
+    SUBCOMMANDS=$( ./easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    if echo "$SUBCOMMANDS" | grep "^$1$"; then
+        # Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
+        echo "Generating command line"
+        set "$EASYRSA/easyrsa" "$@"
 
-# Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
-echo "Generating command line"
-set "$EASYRSA/easyrsa" "$@"
+        # Exec
+        echo "easyrsa command line: $@"
+        exec "$@"
+    fi
+else
+    exec "$EASYRSA/easyrsa" "$@"
+fi
 
-# Exec
-echo "easyrsa command line: $@"
-exec "$@"
+exec "$@"
diff --git a/variants/v3.0.4-alpine-3.8/docker-entrypoint.sh b/variants/v3.0.4-alpine-3.8/docker-entrypoint.sh
@@ -1,11 +1,20 @@
 #!/bin/sh
+set -eu
 
-set -aeo pipefail
+if [ $# -gt 0 ]; then
+    # Get all subcommands. 'help' is also a subcommand
+    SUBCOMMANDS=$( ./easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    if echo "$SUBCOMMANDS" | grep "^$1$"; then
+        # Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
+        echo "Generating command line"
+        set "$EASYRSA/easyrsa" "$@"
 
-# Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
-echo "Generating command line"
-set "$EASYRSA/easyrsa" "$@"
+        # Exec
+        echo "easyrsa command line: $@"
+        exec "$@"
+    fi
+else
+    exec "$EASYRSA/easyrsa" "$@"
+fi
 
-# Exec
-echo "easyrsa command line: $@"
-exec "$@"
+exec "$@"
diff --git a/variants/v3.0.5-alpine-3.9/docker-entrypoint.sh b/variants/v3.0.5-alpine-3.9/docker-entrypoint.sh
@@ -1,11 +1,20 @@
 #!/bin/sh
+set -eu
 
-set -aeo pipefail
+if [ $# -gt 0 ]; then
+    # Get all subcommands. 'help' is also a subcommand
+    SUBCOMMANDS=$( ./easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    if echo "$SUBCOMMANDS" | grep "^$1$"; then
+        # Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
+        echo "Generating command line"
+        set "$EASYRSA/easyrsa" "$@"
 
-# Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
-echo "Generating command line"
-set "$EASYRSA/easyrsa" "$@"
+        # Exec
+        echo "easyrsa command line: $@"
+        exec "$@"
+    fi
+else
+    exec "$EASYRSA/easyrsa" "$@"
+fi
 
-# Exec
-echo "easyrsa command line: $@"
-exec "$@"
+exec "$@"
diff --git a/variants/v3.0.6-alpine-3.10/docker-entrypoint.sh b/variants/v3.0.6-alpine-3.10/docker-entrypoint.sh
@@ -1,11 +1,20 @@
 #!/bin/sh
+set -eu
 
-set -aeo pipefail
+if [ $# -gt 0 ]; then
+    # Get all subcommands. 'help' is also a subcommand
+    SUBCOMMANDS=$( ./easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    if echo "$SUBCOMMANDS" | grep "^$1$"; then
+        # Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
+        echo "Generating command line"
+        set "$EASYRSA/easyrsa" "$@"
 
-# Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
-echo "Generating command line"
-set "$EASYRSA/easyrsa" "$@"
+        # Exec
+        echo "easyrsa command line: $@"
+        exec "$@"
+    fi
+else
+    exec "$EASYRSA/easyrsa" "$@"
+fi
 
-# Exec
-echo "easyrsa command line: $@"
-exec "$@"
+exec "$@"
diff --git a/variants/v3.0.6-alpine-3.11/docker-entrypoint.sh b/variants/v3.0.6-alpine-3.11/docker-entrypoint.sh
@@ -1,11 +1,20 @@
 #!/bin/sh
+set -eu
 
-set -aeo pipefail
+if [ $# -gt 0 ]; then
+    # Get all subcommands. 'help' is also a subcommand
+    SUBCOMMANDS=$( ./easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    if echo "$SUBCOMMANDS" | grep "^$1$"; then
+        # Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
+        echo "Generating command line"
+        set "$EASYRSA/easyrsa" "$@"
 
-# Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
-echo "Generating command line"
-set "$EASYRSA/easyrsa" "$@"
+        # Exec
+        echo "easyrsa command line: $@"
+        exec "$@"
+    fi
+else
+    exec "$EASYRSA/easyrsa" "$@"
+fi
 
-# Exec
-echo "easyrsa command line: $@"
-exec "$@"
+exec "$@"
diff --git a/variants/v3.0.7-alpine-3.12/docker-entrypoint.sh b/variants/v3.0.7-alpine-3.12/docker-entrypoint.sh
@@ -1,11 +1,20 @@
 #!/bin/sh
+set -eu
 
-set -aeo pipefail
+if [ $# -gt 0 ]; then
+    # Get all subcommands. 'help' is also a subcommand
+    SUBCOMMANDS=$( ./easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    if echo "$SUBCOMMANDS" | grep "^$1$"; then
+        # Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
+        echo "Generating command line"
+        set "$EASYRSA/easyrsa" "$@"
 
-# Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
-echo "Generating command line"
-set "$EASYRSA/easyrsa" "$@"
+        # Exec
+        echo "easyrsa command line: $@"
+        exec "$@"
+    fi
+else
+    exec "$EASYRSA/easyrsa" "$@"
+fi
 
-# Exec
-echo "easyrsa command line: $@"
-exec "$@"
+exec "$@"
diff --git a/variants/v3.0.8-alpine-3.13/docker-entrypoint.sh b/variants/v3.0.8-alpine-3.13/docker-entrypoint.sh
@@ -1,11 +1,20 @@
 #!/bin/sh
+set -eu
 
-set -aeo pipefail
+if [ $# -gt 0 ]; then
+    # Get all subcommands. 'help' is also a subcommand
+    SUBCOMMANDS=$( ./easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    if echo "$SUBCOMMANDS" | grep "^$1$"; then
+        # Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
+        echo "Generating command line"
+        set "$EASYRSA/easyrsa" "$@"
 
-# Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
-echo "Generating command line"
-set "$EASYRSA/easyrsa" "$@"
+        # Exec
+        echo "easyrsa command line: $@"
+        exec "$@"
+    fi
+else
+    exec "$EASYRSA/easyrsa" "$@"
+fi
 
-# Exec
-echo "easyrsa command line: $@"
-exec "$@"
+exec "$@"
diff --git a/variants/v3.1.1-alpine-3.17/docker-entrypoint.sh b/variants/v3.1.1-alpine-3.17/docker-entrypoint.sh
@@ -1,11 +1,20 @@
 #!/bin/sh
+set -eu
 
-set -aeo pipefail
+if [ $# -gt 0 ]; then
+    # Get all subcommands. 'help' is also a subcommand
+    SUBCOMMANDS=$( ./easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    if echo "$SUBCOMMANDS" | grep "^$1$"; then
+        # Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
+        echo "Generating command line"
+        set "$EASYRSA/easyrsa" "$@"
 
-# Generate the command line. easy-rsa man: https://github.com/OpenVPN/easy-rsa/blob/v3.0.0/README.quickstart.md
-echo "Generating command line"
-set "$EASYRSA/easyrsa" "$@"
+        # Exec
+        echo "easyrsa command line: $@"
+        exec "$@"
+    fi
+else
+    exec "$EASYRSA/easyrsa" "$@"
+fi
 
-# Exec
-echo "easyrsa command line: $@"
-exec "$@"
+exec "$@"