azure-cli-persistence: Add marker file to avoid double installation

Author: stuartleeks

src/azure-cli-persistence/NOTES.md

@@ -3,6 +3,7 @@
 
 | Version | Notes                                                        |
 | ------- | ------------------------------------------------------------ |
+| 0.0.7   | Add marker files to prevent double installation when a feature is [https://code.visualstudio.com/docs/devcontainers/containers#_always-installed-features](always installed) and in a devcontainer.json file. |
 | 0.0.6   | Add symlink for cliextensions folder                         |
 | 0.0.5   | Use lifecycle scripts                                        |
 | 0.0.4   | Fix test for existing ~/.azure folder                        |

src/azure-cli-persistence/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
     "name": "Azure CLI Persistence",
     "id": "azure-cli-persistence",
-    "version": "0.0.6",
+    "version": "0.0.7",
     "description": "Preserve ~/.azure folder across container instances (avoids needing to login after rebuilding)",
     "options": {},
     "mounts": [

src/azure-cli-persistence/install.sh

@@ -17,6 +17,12 @@ log() {
 log "Activating feature 'azure-cli-persistence'"
 log "User: ${_REMOTE_USER}     User home: ${_REMOTE_USER_HOME}"
 
+# check if marker file exists to avoid re-running oncreate script actions
+if [ -f "$_REMOTE_USER_HOME/.stuartleeks/azure-cli-persistence-install" ]; then
+  log "Feature 'azure-cli-persistence' already installed, skipping oncreate actions"
+  exit 0
+fi
+
 got_old_azure_folder=false
 if [ -e "$_REMOTE_USER_HOME/.azure" ]; then
   log "Moving existing .azure folder to .azure-old"
@@ -31,3 +37,7 @@ if [ -f oncreate.sh ]; then
     mkdir -p "${LIFECYCLE_SCRIPTS_DIR}"
     cp oncreate.sh "${LIFECYCLE_SCRIPTS_DIR}/oncreate.sh"
 fi
+
+log "Adding marker file to indicate persistence is installed"
+mkdir -p "$_REMOTE_USER_HOME/.stuartleeks"
+touch "$_REMOTE_USER_HOME/.stuartleeks/azure-cli-persistence-install"

src/azure-cli-persistence/oncreate.sh

@@ -17,22 +17,12 @@ else
 fi
 
 log "In OnCreate script"
-
-FEATURE_DIR="/usr/local/share/stuartleeks-devcontainer-features/azure-cli-persistence"
-LOG_FILE="$FEATURE_DIR/log.txt"
-
-log() {
-  echo "$1"
-  echo "$1" >> "$LOG_FILE"
-}
-
-if command -v sudo > /dev/null; then
-  sudo chown -R "$(id -u):$(id -g)" "$LOG_FILE"
-else
-  chown -R "$(id -u):$(id -g)" "$LOG_FILE"
+# check if marker file exists to avoid re-running oncreate script actions
+if [ -f "$HOME/.stuartleeks/azure-cli-persistence-oncreate" ]; then
+  log "Feature 'azure-cli-persistence' oncreate actions already run, skipping"
+  exit 0
 fi
 
-log "In OnCreate script"
 
 fix_permissions() {
     local dir
@@ -92,7 +82,7 @@ else
   # If we haven't got an old .azure folder with a cliextensions folder in it, check if the new cliextensions folder is a symlink to the old one
   # And if so, remove the symlink
   # This can happen if the user has installed the azure-cli feature and specified extensions to install
-  # and then later removed the extensions.
+  # and then later removed the extensions.cd
   if [ -L "$new_cliextensions_folder" ]; then
     symlink_target=$(readlink "$new_cliextensions_folder")
     if [ "$symlink_target" = "$old_cliextensions_folder" ]; then
@@ -101,3 +91,12 @@ else
     fi
   fi
 fi
+
+
+log "Adding marker file to indicate oncreate actions have been run"
+mkdir -p "$HOME/.stuartleeks"
+if command -v sudo > /dev/null; then
+  sudo touch "$HOME/.stuartleeks/azure-cli-persistence-oncreate"
+else
+  touch "$HOME/.stuartleeks/azure-cli-persistence-oncreate"
+fi

test-project/.devcontainer/devcontainer.json

@@ -1,7 +1,7 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/ubuntu
 {
-	"name": "devcontainer-features-playground-test1",
+	"name": "devcontainer-features-testproject",
 	"image": "mcr.microsoft.com/vscode/devcontainers/base:0-jammy",
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
@@ -13,12 +13,12 @@
 		"ghcr.io/devcontainers/features/azure-cli": {
 			// "extensions": "containerapp,ssh"
 		},
-		"ghcr.io/devcontainers-extra/features/fish-apt-get": {},
+		// "ghcr.io/devcontainers-extra/features/fish-apt-get": {},
 		"ghcr.io/devcontainers/features/azure-cli:1": {
-			"extensions": "containerapp,ssh"
+			// "extensions": "containerapp,ssh"
 		},
 		"./src/shell-history": {},
 		"./src/azure-cli-persistence": {},
-		"./src/dev-tunnels" : {}
+		// "./src/dev-tunnels" : {}
 	}
 }