better docker build

Author: jh-488

.dockerignore

@@ -5,4 +5,19 @@ Dockerfile
 *.gif
 *.png
 docker
-docs
+docs
+node_modules
+build
+lib
+include
+__pycache__
+*.pyc
+*.pyo
+*.pyd
+.Python
+*.so
+*.egg-info
+.git
+.github
+.nox
+*.log

.github/workflows/docker-publish.yml

@@ -31,7 +31,9 @@ jobs:
           context: ./
           file: ./Dockerfile
           push: true
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
+          cache-from: type=registry,ref=edryslabs/module-pyxtermjs:base-cache
+          cache-to: type=registry,ref=edryslabs/module-pyxtermjs:base-cache,mode=max
           tags: |
             edryslabs/module-pyxtermjs:base
             edryslabs/module-pyxtermjs:base-${{ github.run_number }}
@@ -60,7 +62,9 @@ jobs:
           context: ./docker/arduino
           file: ./docker/arduino/Dockerfile
           push: true
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
+          cache-from: type=registry,ref=edryslabs/module-pyxtermjs:arduino-cache
+          cache-to: type=registry,ref=edryslabs/module-pyxtermjs:arduino-cache,mode=max
           tags: |
             edryslabs/module-pyxtermjs:arduino-v${{ github.run_number }}
             edryslabs/module-pyxtermjs:latest
@@ -89,7 +93,9 @@ jobs:
           context: ./docker/development
           file: ./docker/development/Dockerfile
           push: true
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
+          cache-from: type=registry,ref=edryslabs/module-pyxtermjs:development-cache
+          cache-to: type=registry,ref=edryslabs/module-pyxtermjs:development-cache,mode=max
           tags: |
             edryslabs/module-pyxtermjs:development-v${{ github.run_number }}
             edryslabs/module-pyxtermjs:development

Dockerfile

@@ -1,30 +1,35 @@
 FROM ubuntu:22.04
 
-RUN apt-get update --fix-missing
-RUN apt-get install -y \
+# Install system dependencies
+RUN apt-get update --fix-missing && \
+    apt-get install -y \
     apt-utils \
     python3 \
     python3-pip \
     vim \
     htop \
-    zsh
+    zsh && \
+    rm -rf /var/lib/apt/lists/*
 
-COPY . /var/www
 WORKDIR "/var/www"
-
+COPY requirements.txt .
 RUN pip3 install -r requirements.txt
 
-# Setup appuser and appgroup
+# Setup appuser and appgroup before copying files
 ARG user=appuser
 ARG group=appuser
 ARG uid=1000
 ARG gid=1000
-RUN groupadd -g ${gid} ${group}
-RUN useradd -u ${uid} -g ${group} -s /bin/sh -m ${user} # <--- the '-m' create a user home directory
+RUN groupadd -g ${gid} ${group} && \
+    useradd -u ${uid} -g ${group} -s /bin/sh -m ${user}
 
+# Copy zsh configuration
 COPY _assets/.zshrc /home/appuser/.zshrc
 COPY _assets/oh-my-zsh /home/appuser/.oh-my-zsh
 
+# Copy application files
+COPY . .
+
 # Switch to user we must not set group to make the configuration done above apply
 # !! if ${user} is not setup correctly the next line might result in group being root !!
 USER ${user}