feat: Add capability to run docker-in-docker

Author: milesburton

.devcontainer/Dockerfile

@@ -8,70 +8,56 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     git \
     curl \
     fish \
+    docker.io \
+    sudo \
+    build-essential \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-RUN mkdir -p /home/vscode/.local/share/CMakeTools \
-&& chown -R vscode:vscode /home/vscode/.local/share/CMakeTools
+# Add user to docker group
+RUN usermod -aG docker vscode
 
-RUN mkdir -p /home/vscode/.ssh \
+# Create directories and set permissions
+RUN mkdir -p /home/vscode/.local/share/CMakeTools \
+    && chown -R vscode:vscode /home/vscode/.local/share/CMakeTools \
+    && mkdir -p /home/vscode/.ssh \
     && chown vscode:vscode /home/vscode/.ssh \
     && chmod 700 /home/vscode/.ssh
 
-# Install arduino-cli
-RUN curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | sh
-
-# Set up arduino-cli config
-RUN arduino-cli config init
+# Install Arduino CLI
+RUN curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | sh \
+    && arduino-cli config init
 
-# Add arduino-cli to PATH
 ENV PATH="/usr/local/bin:${PATH}"
-
-# Create workspace directory
 WORKDIR /workspace
 
-# Copy arduino-cli configuration (customise to your actual path)
+# Copy Arduino config and update script
 COPY arduino-cli.yaml /root/.arduino15/arduino-cli.yaml
-
-# Install build essentials
-RUN apt-get update && apt-get install -y build-essential && rm -rf /var/lib/apt/lists/*
-
-# (Optional) Install Arduino cores for ESP8266 and ESP32 if needed
-RUN arduino-cli core install esp8266:esp8266 esp32:esp32
-
-# Install only required dependencies for DallasTemperature library and others
-RUN arduino-cli lib install \
-    "OneWire" \
-    "ArduinoUnit"  # For testing
-
-# Verify library installation
-RUN arduino-cli lib list
-
-# Copy update script
 COPY update-libraries.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/update-libraries.sh
 
-# Add aliases for build operations (for Bash)
-RUN echo 'alias arduino-build="./build.sh build"' >> /home/vscode/.bashrc && \
-    echo 'alias arduino-test="./build.sh test"' >> /home/vscode/.bashrc && \
-    echo 'alias arduino-build-test="./build.sh all"' >> /home/vscode/.bashrc
+# Install Arduino cores and libraries
+RUN arduino-cli core install esp8266:esp8266 esp32:esp32 \
+    && arduino-cli lib install "OneWire" "ArduinoUnit" \
+    && arduino-cli lib list
 
-# Add a welcome message to .bashrc
-RUN echo '\n# Welcome to the dev container! Here are some useful aliases:' >> /home/vscode/.bashrc && \
-    echo 'echo "  - arduino-build: Build the project"' >> /home/vscode/.bashrc && \
-    echo 'echo "  - arduino-test: Run tests for the project"' >> /home/vscode/.bashrc && \
-    echo 'echo "  - arduino-build-test: Build and test the project"' >> /home/vscode/.bashrc
+# Configure shells
+RUN echo 'alias arduino-build="./build.sh build"\nalias arduino-test="./build.sh test"\nalias arduino-build-test="./build.sh all"' >> /home/vscode/.bashrc \
+    && echo '\n# Welcome to the dev container! Here are some useful aliases:\necho "  - arduino-build: Build the project"\necho "  - arduino-test: Run tests for the project"\necho "  - arduino-build-test: Build and test the project"' >> /home/vscode/.bashrc \
+    && mkdir -p /home/vscode/.config/fish \
+    && echo 'set -gx PATH /usr/local/bin $PATH\n# Welcome to the Fish shell inside the dev container!' >> /home/vscode/.config/fish/config.fish
 
-# (Optional) Add fish-specific configuration if desired
-# For example, you might add an alias file or welcome message for fish:
-RUN mkdir -p /home/vscode/.config/fish && \
-    echo 'set -gx PATH /usr/local/bin $PATH' >> /home/vscode/.config/fish/config.fish && \
-    echo '# Welcome to the Fish shell inside the dev container!' >> /home/vscode/.config/fish/config.fish
-
-# Generate SSH keys and set proper ownership and permissions
+# Generate SSH keys
 RUN if [ ! -f /home/vscode/.ssh/id_rsa ]; then \
         ssh-keygen -t rsa -b 4096 -N "" -C "devcontainer@local" -f /home/vscode/.ssh/id_rsa && \
         chmod 600 /home/vscode/.ssh/id_rsa && \
         chmod 644 /home/vscode/.ssh/id_rsa.pub && \
         chown vscode:vscode /home/vscode/.ssh/id_rsa /home/vscode/.ssh/id_rsa.pub ; \
     fi
+
+# Docker-in-Docker setup
+RUN echo '#!/bin/sh\nchmod 666 /var/run/docker.sock\nexec "$@"' > /usr/local/bin/docker-entrypoint.sh \
+    && chmod +x /usr/local/bin/docker-entrypoint.sh
+
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
+CMD ["sleep", "infinity"]

.devcontainer/devcontainer.json

@@ -1,23 +1,29 @@
 {
-    "name": "Arduino Library Development",
-    "dockerFile": "Dockerfile",
-    "mounts": [
+  "name": "Arduino Library Development",
+  "build": {
+      "dockerfile": "Dockerfile",
+      "context": ".."
+  },
+  "mounts": [
       "source=devcontainer_ssh,target=/home/vscode/.ssh,type=volume",
       "source=devcontainer_bash_history,target=/home/vscode/.bash_history,type=volume",
-      "source=devcontainer_fish_history,target=/home/vscode/.local/share/fish/fish_history,type=volume"
-    ],
-    "customizations": {
+      "source=devcontainer_fish_history,target=/home/vscode/.local/share/fish/fish_history,type=volume",
+      "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
+  ],
+  "customizations": {
       "vscode": {
-        "extensions": [
-          "vsciot-vscode.vscode-arduino",
-          "ms-vscode.cpptools",
-          "ms-azuretools.vscode-docker",
-          "yzhang.markdown-all-in-one"
-        ]
+          "extensions": [
+              "vsciot-vscode.vscode-arduino",
+              "ms-vscode.cpptools",
+              "ms-azuretools.vscode-docker",
+              "yzhang.markdown-all-in-one"
+          ],
+          "settings": {
+              "terminal.integrated.defaultProfile.linux": "fish",
+              "arduino.path": "/usr/local/bin/arduino-cli"
+          }
       }
-    },
-    "postCreateCommand": "arduino-cli core install arduino:avr && arduino-cli lib install ArduinoUnit && /usr/local/bin/update-libraries.sh",
-    "updateContentCommand": "/usr/local/bin/update-libraries.sh",
-    "remoteUser": "vscode"
-  }
-  
+  },
+  "postCreateCommand": "arduino-cli core install arduino:avr && arduino-cli lib install ArduinoUnit && /usr/local/bin/update-libraries.sh",
+  "remoteUser": "vscode"
+}