Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions drupal-contrib/template.tf
Original file line number Diff line number Diff line change
Expand Up @@ -434,11 +434,20 @@ EOF
ddev config global --omit-containers=ddev-router --instrumentation-opt-in=false > /dev/null 2>&1 || true
mkcert -install 2>/dev/null || true

# Pre-pull DDEV images (uses registry mirror if configured). Redirect --
# non-TTY docker pull progress prints a new line per layer per tick
# (often written to stderr), so unredirected this alone was 95% of a
# workspace's entire startup log.
_t_images=$SECONDS
echo "Pre-pulling DDEV images..."
ddev utility download-images || true
IMAGES_TIME=$((SECONDS - _t_images))
echo " ddev utility download-images complete ($${IMAGES_TIME}s)"
if ddev utility download-images > /tmp/ddev-download-images.log 2>&1; then
IMAGES_TIME=$((SECONDS - _t_images))
echo " ✓ ddev utility download-images complete ($${IMAGES_TIME}s)"
else
IMAGES_TIME=$((SECONDS - _t_images))
echo " ⚠ ddev utility download-images failed after $${IMAGES_TIME}s (see /tmp/ddev-download-images.log)"
tail -20 /tmp/ddev-download-images.log || true
fi

# ==========================================
# DRUPAL CONTRIB AUTOMATIC SETUP
Expand Down Expand Up @@ -1057,6 +1066,9 @@ BASHPROFILE_WELCOME
CODER_WORKSPACE_OWNER_NAME = data.coder_workspace_owner.me.name
CODER_WORKSPACE_OWNER_EMAIL = data.coder_workspace_owner.me.email
HOME = "/home/coder"
# Silences Node's runtime deprecation warnings (e.g. url.parse()) that
# code-server prints once per extension during VS Code Web's install step.
NODE_NO_WARNINGS = "1"
}

metadata {
Expand Down
19 changes: 15 additions & 4 deletions drupal-core/template.tf
Original file line number Diff line number Diff line change
Expand Up @@ -523,12 +523,20 @@ EOF
# DDEV ships its own mkcert binary; this sets up the local CA trust
mkcert -install 2>/dev/null || true

# Pre-pull DDEV images (uses registry mirror if configured)
# Pre-pull DDEV images (uses registry mirror if configured). Redirect --
# non-TTY docker pull progress prints a new line per layer per tick
# (often written to stderr), so unredirected this alone was 95% of a
# workspace's entire startup log.
_t_images=$SECONDS
echo "Pre-pulling DDEV images..."
ddev utility download-images || true
IMAGES_TIME=$((SECONDS - _t_images))
echo " ddev utility download-images complete ($${IMAGES_TIME}s)"
if ddev utility download-images > /tmp/ddev-download-images.log 2>&1; then
IMAGES_TIME=$((SECONDS - _t_images))
echo " ✓ ddev utility download-images complete ($${IMAGES_TIME}s)"
else
IMAGES_TIME=$((SECONDS - _t_images))
echo " ⚠ ddev utility download-images failed after $${IMAGES_TIME}s (see /tmp/ddev-download-images.log)"
tail -20 /tmp/ddev-download-images.log || true
fi

# ==========================================
# DRUPAL CORE AUTOMATIC SETUP
Expand Down Expand Up @@ -1345,6 +1353,9 @@ BASHCOMP
CODER_WORKSPACE_OWNER_EMAIL = data.coder_workspace_owner.me.email
# Force HOME to /home/coder (Standard Home Strategy)
HOME = "/home/coder"
# Silences Node's runtime deprecation warnings (e.g. url.parse()) that
# code-server prints once per extension during VS Code Web's install step.
NODE_NO_WARNINGS = "1"
}

metadata {
Expand Down
17 changes: 15 additions & 2 deletions freeform/template.tf
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,18 @@ EOF
echo "✓ DDEV host commands installed"
fi

# Pre-pull DDEV images (uses registry mirror if configured)
ddev utility download-images || true
# Pre-pull DDEV images (uses registry mirror if configured). Redirect --
# non-TTY docker pull progress prints a new line per layer per tick
# (often written to stderr), so unredirected this alone was 95% of a
# workspace's entire startup log.
echo "Pre-pulling DDEV images..."
_t_images=$SECONDS
if ddev utility download-images > /tmp/ddev-download-images.log 2>&1; then
echo "✓ DDEV images ready ($((SECONDS - _t_images))s)"
else
echo "⚠ ddev utility download-images failed (see /tmp/ddev-download-images.log)"
tail -20 /tmp/ddev-download-images.log || true
fi

# Ensure yq and linuxbrew are in PATH for this session
export PATH="$PATH:/home/linuxbrew/.linuxbrew/bin"
Expand Down Expand Up @@ -427,6 +437,9 @@ BASHCOMP
CODER_WORKSPACE_OWNER_EMAIL = data.coder_workspace_owner.me.email
CODER_PROJECT_NAMES = join(",", local.project_names)
HOME = "/home/coder"
# Silences Node's runtime deprecation warnings (e.g. url.parse()) that
# code-server prints once per extension during VS Code Web's install step.
NODE_NO_WARNINGS = "1"
}

metadata {
Expand Down
Loading