chore: Update devcontainer feature for Alpine Magento Cloud CLI

cirolosapio · Apr 20, 2024 · d1360eb · d1360eb
1 parent 53221b8
commit d1360eb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/alpine-magento-cloud-cli/devcontainer-feature.json b/src/alpine-magento-cloud-cli/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "alpine-magento-cloud-cli",
   "id": "alpine-magento-cloud-cli",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Installs magento-cloud-cli on alpine",
   "documentationURL": "https://github.com/cirolosapio/devcontainers-features/tree/main/src/alpine-magento-cloud-cli",
   "installsAfter": [
@@ -11,5 +11,16 @@
     "ghcr.io/cirolosapio/devcontainers-features/alpine-php-pcntl": {},
     "ghcr.io/cirolosapio/devcontainers-features/alpine-php-posix": {},
     "ghcr.io/cirolosapio/devcontainers-features/alpine-openssh": {}
+  },
+  "options": {
+    "shellType": {
+      "description": "The shell type to use",
+      "type": "string",
+      "default": "zsh",
+      "enum": [
+        "zsh",
+        "bash"
+      ]
+    }
   }
 }
diff --git a/src/alpine-magento-cloud-cli/install.sh b/src/alpine-magento-cloud-cli/install.sh
@@ -4,14 +4,19 @@ set -e
 
 echo "Activating feature 'alpine-magento-cloud-cli'"
 
-apk --no-cache add curl
+apk --no-cache add curl git
 
 CURRENT_USER=$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)
 
 CMD="cd $_CONTAINER_USER_HOME && curl -sS https://accounts.magento.cloud/cli/installer | php"
 
-if command -v zsh &> /dev/null; then
+if [ "$SHELLTYPE" = "zsh" ]; then
+    apk --no-cache add zsh
+    sed -i "s|:/bin/ash|:/bin/zsh|g" /etc/passwd
     CMD="$CMD -- --shell-type zsh"
+else
+    apk --no-cache add bash
+    CMD="$CMD -- --shell-type bash"
 fi
 
 su -c "$CMD" $CURRENT_USER