Skip to content

Commit cc6abea

Browse files
committed
add docker command for wsl2 v5
1 parent 80b9dfd commit cc6abea

2 files changed

Lines changed: 16 additions & 9 deletions

File tree

install-windows.sh

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,26 @@ if [ -f /etc/debian_version ]; then
7474
sudo dockerd > /tmp/dockerd.log 2>&1 &
7575
DOCKERD_PID=$!
7676

77-
# Wait up to 10 seconds for docker to start
78-
for i in {1..10}; do
79-
if sudo docker info > /dev/null 2>&1; then
77+
# Wait up to 15 seconds for docker to start
78+
echo "Waiting for Docker daemon to initialize..."
79+
for i in {1..15}; do
80+
if sudo docker ps > /dev/null 2>&1; then
8081
echo "✅ Docker daemon started successfully"
8182
break
8283
fi
84+
echo -n "."
8385
sleep 1
8486
done
87+
echo ""
8588

86-
# Final check
87-
if ! sudo docker info > /dev/null 2>&1; then
88-
echo "⚠️ Docker daemon failed to start. Check /tmp/dockerd.log for details"
89-
tail -20 /tmp/dockerd.log
89+
# Final check - test both info and ps
90+
if ! sudo docker ps > /dev/null 2>&1; then
91+
echo "⚠️ Docker daemon failed to start properly."
92+
echo "Error log from /tmp/dockerd.log:"
93+
tail -30 /tmp/dockerd.log
94+
echo ""
95+
echo "Trying to diagnose issue..."
96+
sudo docker info 2>&1 | head -20 || true
9097
exit 1
9198
fi
9299
else

src/install/setupLocal.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ const needsSudoForDocker = (): boolean => {
2121
// Helper for shell commands
2222
const runCommand = (command: string, throwOnError = true) => {
2323
try {
24-
// Auto-prefix docker commands with sudo if needed
24+
// Auto-prefix docker/devcontainer commands with sudo if needed
2525
let finalCommand = command;
26-
if (command.includes('docker') && needsSudoForDocker()) {
26+
if ((command.includes('docker') || command.includes('devcontainer')) && needsSudoForDocker()) {
2727
finalCommand = `sudo ${command}`;
2828
console.log('ℹ️ Using sudo for Docker commands (run without sudo after logging out/in)');
2929
}

0 commit comments

Comments
 (0)