prevent unused files to end up in docker images

BrewBlox · Jan 15, 2025 · ce85cf0 · ce85cf0
1 parent a5a900b
commit ce85cf0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -2,3 +2,5 @@
 *.egg-info
 brewblox-proto
 test
+firmware/*.map
+firmware/*.lst
diff --git a/Dockerfile.flasher b/Dockerfile.flasher
@@ -1,4 +1,4 @@
-# syntax=docker.io/docker/dockerfile:1.7-labs
+# syntax=docker/dockerfile:1-labs
 FROM python:3.11-slim-bookworm
 
 ENV PIP_EXTRA_INDEX_URL=https://www.piwheels.org/simple
@@ -15,12 +15,12 @@ RUN <<EOF bash
         libatomic1 \
         usbutils
 
-    pip3 install \
+    pip3 install --no-cache-dir \
         cffi==1.17.1 \
         cryptography==42.0.8 \
         esptool
 
-    CLI_VERSION="3.24.0"
+    CLI_VERSION="3.29.1"
     ARCH="$(dpkg --print-architecture)"
     if [ "\${ARCH}" = "amd64" ]; then
         CLI_ARCH="x64"
@@ -41,6 +41,6 @@ RUN <<EOF bash
     rm -rf /var/cache/apt/archives /var/lib/apt/lists
 EOF
 
-COPY --exclude=*.sim ./firmware/* ./
+COPY --exclude=*.sim firmware/ ./
 
 ENTRYPOINT [ "/bin/bash" ]
diff --git a/Dockerfile.service b/Dockerfile.service
@@ -24,12 +24,15 @@ RUN ARCH="$(dpkg --print-architecture)"; \
     set -ex; \
     cd /app/firmware; \
     if [ "$ARCH" = "amd64" ]; then \
-    rm -f ./brewblox-{arm32,arm64}.sim; \
+    echo "Building for amd64"; \
+    rm -f brewblox-arm32.sim; rm -f brewblox-arm64.sim; \
     elif [ "$ARCH" = "armhf" ]; then \
-    rm -f ./brewblox-{amd64,arm64}.sim; \
+    echo "Building for armhf"; \
+    rm -f brewblox-amd64.sim; rm -f brewblox-arm64.sim; \
     elif [ "$ARCH" = "arm64" ]; then \
-    rm -f ./brewblox-{amd64,arm32}.sim; \
-    fi
+    echo "Building for arm64"; \
+    rm -f ./brewblox-amd64.sim; rm -f brewblox-arm32.sim; \
+    fi;
 
 FROM python:3.11-slim-bookworm
 EXPOSE 5000

diff --git a/brewblox_devcon_spark/models.py b/brewblox_devcon_spark/models.py
@@ -78,6 +78,7 @@ class ResetData(enum.Enum):
     LISTENING_MODE_EXIT = '05'
     FIRMWARE_UPDATE_SUCCESS = '06'
     OUT_OF_MEMORY = '07'
+    FIRMWARE_UPDATE_TCP_SERVER_FAILED = '08'
 
     def __str__(self):
         return self.name

diff --git a/tasks.py b/tasks.py
@@ -107,7 +107,7 @@ def testclean(ctx: Context):
 @task()
 def image(ctx: Context, tag='local'):
     with ctx.cd(ROOT):
-        ctx.run(f'docker build -t ghcr.io/brewblox/brewblox-devcon-spark:{tag} -f Dockerfile.service .')
+        ctx.run(f'docker build --load -t ghcr.io/brewblox/brewblox-devcon-spark:{tag} -f Dockerfile.service .')
 
 
 @task()
@@ -121,7 +121,7 @@ def buildx(ctx: Context, tag='local', platform='linux/amd64,linux/arm/v7,linux/a
 @task()
 def flasher_image(ctx: Context, tag='local'):
     with ctx.cd(ROOT):
-        ctx.run(f'docker build -t ghcr.io/brewblox/brewblox-firmware-flasher:{tag} -f Dockerfile.flasher .')
+        ctx.run(f'docker build --load -t ghcr.io/brewblox/brewblox-firmware-flasher:{tag} -f Dockerfile.flasher .')
 
 
 @task()