Trigger container build

Author: tannewt

.github/workflows/build-containers.yml

@@ -2,7 +2,12 @@ name: Build Container Images
 
 on:
   push:
-    branches: [main]
+    branches: [main, containerize]
+    paths:
+      - containers/**
+      - requirements-dev.txt
+      - .github/workflows/build-containers.yml
+  pull_request:
     paths:
       - containers/**
       - requirements-dev.txt
@@ -51,6 +56,7 @@ jobs:
             zephyr:
               - containers/base/**
               - containers/zephyr/**
+              - ports/zephyr-cp/zephyr-config/**
               - requirements-dev.txt
             dev:
               - containers/**

containers/base/Dockerfile

@@ -6,7 +6,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential cmake mtools uncrustify \
     gettext wget curl ca-certificates \
     pkg-config autoconf automake libtool \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* \
+    && update-alternatives --install /usr/bin/python python /usr/bin/python3 1
 
 # dosfstools 4.2 (newer than apt's 4.1)
 RUN wget -q https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz \

containers/zephyr/Dockerfile

@@ -7,15 +7,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 RUN pip install --break-system-packages west
 
-# Zephyr SDK
-RUN wget -qO- "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.0/zephyr-sdk-0.17.0_linux-x86_64.tar.xz" \
-    | tar xJ -C /opt/ \
-    && /opt/zephyr-sdk-0.17.0/setup.sh -t arm-zephyr-eabi
-ENV ZEPHYR_SDK_INSTALL_DIR=/opt/zephyr-sdk-0.17.0
-
 # West workspace — pins come from zephyr-config/west.yml
 COPY ports/zephyr-cp/zephyr-config/west.yml /circuitpython/ports/zephyr-cp/zephyr-config/west.yml
 WORKDIR /circuitpython/ports/zephyr-cp
 RUN west init -l zephyr-config && west update
 RUN west zephyr-export
+
+# Zephyr SDK via west
+RUN west sdk install
 WORKDIR /circuitpython