.gitlab-ci.yml

@@ -13,8 +13,13 @@ docker-build:
         tag=":$CI_COMMIT_REF_SLUG"
         echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
       fi
-    - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" .
-    - docker push "$CI_REGISTRY_IMAGE${tag}"
+    #- docker buildx use $(docker buildx create --platform linux/arm64,linux/amd64,linux/riscv64,linux/arm/v7)
+    - BUILDKIT_PROGRESS=plain docker buildx build --platform=linux/arm64,linux/amd64,linux/arm/v7 -t "${CI_REGISTRY_IMAGE}:bookworm" --build-arg="FRM=debian:bookworm-slim" --push .
+    - BUILDKIT_PROGRESS=plain docker buildx build --platform=linux/arm64,linux/amd64,linux/arm/v7 -t "${CI_REGISTRY_IMAGE}:latest" --build-arg="FRM=debian:bookworm-slim" --push .
+    #docker buildx build --platform linux/arm64,linux/amd64,linux/arm/v7,linux/riscv64 -t beagle/ubuntu-build:jammy --build-arg="FRM=ubuntu:jammy" --push .
+    #docker buildx build --platform linux/arm64,linux/amd64,linux/arm/v7,linux/riscv64 -t beagle/ubuntu-build:lunar --build-arg="FRM=ubuntu:lunar" --push .
+    #docker buildx build --platform linux/arm64,linux/amd64,linux/arm/v7,linux/riscv64 -t beagle/ubuntu-build:mantic --build-arg="FRM=ubuntu:mantic" --push .
+    - BUILDKIT_PROGRESS=plain docker buildx build --platform linux/arm64,linux/riscv64 -t "${CI_REGISTRY_IMAGE}:noble" --build-arg="FRM=ubuntu:noble" --push .
   rules:
     - if: $CI_COMMIT_BRANCH
       exists:

Dockerfile

-FROM debian:bullseye as debian-build
+ARG FRM=jkridner/ubuntu-24-04-$TARGETARCH:latest
+ARG TARGETARCH
+
+FROM ${FRM} as build
 ENV DEBIAN_FRONTEND=noninteractive
+ENV BALENA_CLI_URL=https://dl.beagle.cc/balena-cli-v18.2.34-linux-x64-standalone.zip
+
 RUN apt-get update \
-    && apt-get install -y apt-utils \
-    && rm -rf /var/lib/apt/lists/*
-RUN apt-get update \
-    && apt-get install -y locales \
-	&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 \
-    && rm -rf /var/lib/apt/lists/*
-ENV LANG en_US.utf8
-RUN apt-get update \
-    && apt-get -o APT::Install-Suggests="true" install -y devscripts \
-    && apt-get install -y \
-        build-essential curl gpg git wget tar \
+    && apt-get install -y apt-utils ca-certificates \
+    && apt-get clean
+
+#RUN apt-get update \
+#    && apt-get install -y locales \
+#    && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 \
+#    && apt-get clean
+#ENV LANG en_US.utf8
+
+RUN . /etc/os-release \
+    && export ARCHNAME="$(dpkg --print-architecture)" \
+    && echo "Setting release to ${VERSION_CODENAME}..." \
+    && echo "Setting arch to ${ARCHNAME}..." \
+    && echo "Setting distro to ${ID}..." \
+    && echo "deb [trusted=yes] https://debian.beagle.cc/${ARCHNAME}/ ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/beagle.list \
+    && echo "deb-src [trusted=yes] https://debian.beagle.cc/${ARCHNAME}/ ${VERSION_CODENAME} main" >> /etc/apt/sources.list.d/beagle.list \
+    && apt-get update \
+    && apt-get upgrade -y \
+    && apt-get install -y --no-install-recommends \
+        docker.io    \
+        bbb.io-keyring    \
+        apindex    \
+        cmake    \
+        build-essential \
+        debhelper-compat \
+        devscripts \
+        curl gpg git wget tar \
         autoconf libtool autotools-dev \
         libssl-dev libxml2-dev libyaml-dev libgmp-dev libz-dev \
-        file cpio unzip bc rsync bison flex device-tree-compiler python3-distutils swig python3-dev ccache \
-    && rm -rf /var/lib/apt/lists/*
+        file cpio unzip bc rsync bison flex device-tree-compiler python3-setuptools swig python3-dev ccache \
+    && cp -v /etc/bbb.io/templates/apt/sbuild.list /etc/apt/sources.list.d/beagle.list \
+    && apt-get clean
+RUN export ARCHNAME="$(dpkg --print-architecture)" ; \
+    if [ "${ARCHNAME}" = "amd64" ] ; then \
+        wget "${BALENA_CLI_URL}" -O x.zip ; \
+        mkdir -p /opt ; \
+        unzip x.zip -d /opt ; \
+        rm x.zip ; \
+        echo "export PATH=\$PATH:/opt/balena-cli" >> /etc/environment ; \
+    fi
\ No newline at end of file

README.md

 # debian-build
 
-Docker image for Debian package builds
\ No newline at end of file
+Docker image for Debian package builds
+
+## Available images
+
+[Debian](https://hub.docker.com/repository/docker/beagle/debian-build/general)
+
+* `beagle/debian-build:latest`: amd64, armhf, arm64 - Bookworm
+* `beagle/debian-build:bookworm`: amd64, armhf, arm64 - Bookworm
+* `beagle/debian-build:bullsye`: amd64, armhf, arm64 - Bullseye
+
+[Ubuntu](https://hub.docker.com/repository/docker/beagle/ubuntu-build/general)
+
+* `beagle/ubuntu-build:latest`: amd64, armhf, arm64, riscv64 - 23.10