Handle no sudo, switch to poststart script

Author: stuartleeks

src/add-host/NOTES.md

@@ -0,0 +1,7 @@
+
+## Changelog
+
+| Version | Notes                                                               |
+| ------- | ------------------------------------------------------------------- |
+| 1.0.3   | Handle no sudo, switch to poststart script                          |
+| 1.0.1   | Initial version                                                     |

src/add-host/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
   "id": "add-host",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "name": "Add Host",
   "description": "Add a hosts file entry in the dev container.",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/add-host",
@@ -16,5 +16,7 @@
       "description": "The IP Address to associate with the host name"
     }
   },
-  "postStartCommand": "sudo cp /etc/hosts /etc/hosts_old && cat /etc/hosts_old | sed '/host.docker.internal$/d' > /tmp/hosts && cat /etc/hosts_temp | tee -a /tmp/hosts > /dev/null && sudo cp /tmp/hosts /etc/hosts"
+  "postStartCommand": {
+    "azure-cli-persistence": "/usr/local/share/stuartleeks-devcontainer-features/add-host/scripts/poststart.sh"
+  }
 }

src/add-host/install.sh

@@ -1,14 +1,9 @@
 #!/usr/bin/env bash
-#-------------------------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
-#-------------------------------------------------------------------------------------------------------------
-#
-# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/hugo.md
-# Maintainer: The VS Code and Codespaces Teams
 
 set -e
 
+LIFECYCLE_SCRIPTS_DIR="/usr/local/share/stuartleeks-devcontainer-features/add-host/scripts"
+
 if [[ -z $HOST_IP ]];
 then
     echo "HOST_IP is not set. Exiting..."
@@ -23,5 +18,7 @@ if [[ $(command -v sudo > /dev/null; echo $?) == 0 ]]; then
 else
     echo "$HOST_IP $HOST_NAME" >> /etc/hosts_temp
 fi
-echo "Done!"
 
+mkdir -p "${LIFECYCLE_SCRIPTS_DIR}"
+cp poststart.sh "${LIFECYCLE_SCRIPTS_DIR}/poststart.sh"
+echo "Done!"

src/add-host/poststart.sh

@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+
+set -e
+
+
+echo "Activating feature 'add-host'"
+echo "User: $(id -un)"
+echo "User home: $HOME"
+
+# Parse "HOST_IP HOST_NAME" from /etc/hosts_temp
+if [[ -f /etc/hosts_temp ]]; then
+    while read -r line; do
+        if [[ $line =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+ ]]; then
+            HOST_IP=$(echo "$line" | awk '{print $1}')
+            HOST_NAME=$(echo "$line" | awk '{print $2}')
+            break
+        fi
+    done < /etc/hosts_temp
+else
+    echo "No /etc/hosts_temp file found. Exiting..."
+    exit 1
+fi
+
+echo "HOST_IP: $HOST_IP"
+echo "HOST_NAME: $HOST_NAME"
+
+if [[ $(command -v sudo > /dev/null; echo $?) == 0 ]]; then
+    have_sudo=true
+else
+    have_sudo=false
+fi
+
+# backup hosts file
+if [[ $have_sudo == true ]]; then
+    sudo cp /etc/hosts /etc/hosts_old
+else
+    cp /etc/hosts /etc/hosts_old
+fi
+
+# remove old entry
+cat /etc/hosts_old | sed "/$HOST_NAME\$/d" > /tmp/hosts
+# add new entry
+cat /etc/hosts_temp | tee -a /tmp/hosts > /dev/null
+
+# copy temp hosts file to /etc/hosts
+if [[ $have_sudo == true ]]; then
+    sudo cp /tmp/hosts /etc/hosts
+else
+    cp /tmp/hosts /etc/hosts
+fi