From 0f86a906020bb044a64c52ba0a837f21a357c1cc Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Fri, 30 Aug 2024 15:25:22 +0200 Subject: [PATCH] docker: Update docker build. --- docker/Dockerfile | 2 +- docker/build.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index cddd2bb3f..3d398f3ed 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 AS dapper +FROM ubuntu:22.04 AS dapper ARG DAPPER_HOST_ARCH ENV DAPPER_ENV TARGET ENV ARCH $DAPPER_HOST_ARCH diff --git a/docker/build.sh b/docker/build.sh index 74f019d02..0a4421857 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -4,12 +4,12 @@ set -e -x cd $(dirname $0)/.. -export PATH=/source/gcc/bin:/source/llvm/bin:/source/cmake/bin:$PATH +export PATH=/source/gcc/bin:/source/cmake/bin:$PATH git submodule update --init --depth=1 git -C src/micropython/ submodule update --init --depth=1 # Build the firmware. make -j$(nproc) -C src/micropython/mpy-cross -make -j$(nproc) TARGET=$TARGET -C src +make -j$(nproc) TARGET=$TARGET LLVM_PATH=/source/llvm/bin -C src mkdir -p ./docker/build/$TARGET cp -r src/build/bin/* ./docker/build/$TARGET