feat: ensure that .gitignored files are correctly gitignored

Author: damienwebdev

.gitignore.sample

@@ -0,0 +1,4 @@
+# Local, per-developer devcontainer files — seeded from samples by
+# bin/host-bootstrap.sh on container create, so they don't need to be committed.
+.env
+docker-compose.local.yml

bin/host-bootstrap.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Host-side devcontainer bootstrap, run from initializeCommand BEFORE the
+# container is created. Seeds the per-project files the compose stack needs
+# from the submodule's samples on first run.
+#
+# This lives in a script (rather than as parallel initializeCommand keys)
+# because the samples live inside the submodule: the copies must run AFTER the
+# submodule is checked out. initializeCommand inits the submodule first, then
+# invokes this, keeping the ordering deterministic instead of racing.
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+SUBMODULE_DIR="$(dirname "$SCRIPT_DIR")"        # .devcontainer/magento2-devcontainer
+DEVCONTAINER_DIR="$(dirname "$SUBMODULE_DIR")"  # .devcontainer
+
+# .env and docker-compose.local.yml are gitignored / per-project, and
+# docker-compose.local.yml is referenced by dockerComposeFile — so the
+# container won't build without them. Seed from samples if missing.
+[ -f "$DEVCONTAINER_DIR/.env" ] \
+    || cp "$SUBMODULE_DIR/.env.sample" "$DEVCONTAINER_DIR/.env"
+[ -f "$DEVCONTAINER_DIR/docker-compose.local.yml" ] \
+    || cp "$SUBMODULE_DIR/docker-compose.local.yml.sample" "$DEVCONTAINER_DIR/docker-compose.local.yml"

bin/init.sh

@@ -113,6 +113,10 @@ cp "$DEVCONTAINER_FOLDER/docker-compose.shared.yml.sample" "$TARGET_DIR/docker-c
 cp "$DEVCONTAINER_FOLDER/docker-compose.local.yml.sample" "$TARGET_DIR/docker-compose.local.yml"
 echo "services: {}" > "$TARGET_DIR/docker-compose.yml"
 
+## Copy the .gitignore so the per-developer local files (.env,
+## docker-compose.local.yml) that host-bootstrap.sh re-seeds aren't committed.
+cp "$DEVCONTAINER_FOLDER/.gitignore.sample" "$TARGET_DIR/.gitignore"
+
 ## Copy over devcontainer and set the name and compose key.
 ## Every compose key is <distribution>/<version> so a single alternation
 ## covers magento, mage-os, and mage-os-minimal. Uses `#` as the s-delimiter

devcontainer.json.sample

@@ -12,7 +12,7 @@
     8000,
     8025
   ],
-  "initializeCommand": "[ -f .devcontainer/magento2-devcontainer/.gitignore ] || (git submodule update --init --recursive)",
+  "initializeCommand": "[ -f .devcontainer/magento2-devcontainer/.gitignore ] || git submodule update --init --recursive; .devcontainer/magento2-devcontainer/bin/host-bootstrap.sh",
   "postStartCommand": ".devcontainer/magento2-devcontainer/bin/forward-ports.sh",
   "portsAttributes": {
     "8000": {