Skip to content

Commit aea9df9

Browse files
committed
[CI] Fix issue with lvgl 32 docker image
Signed-off-by: Jean-Pierre Miceli <jean-pierre.miceli@heig-vd.ch>
1 parent 8a65664 commit aea9df9

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

.github/workflows/build.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,9 @@ on:
66
- main
77
pull_request:
88
branches: ["main", "144-support-musl"]
9-
workflow_run:
10-
workflows: ["Docker Image CI"]
11-
types: [completed]
129

1310
jobs:
1411
build-so3:
15-
if: ${{ github.event.workflow_run.conclusion == 'success' }}
1612
runs-on: ubuntu-latest
1713
strategy:
1814
fail-fast: false
@@ -31,7 +27,6 @@ jobs:
3127
docker run --rm -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "cd so3 && make ${{ matrix.CONFIG }} && make -j`nproc`"
3228
3329
build-usr:
34-
if: ${{ github.event.workflow_run.conclusion == 'success' }}
3530
runs-on: ubuntu-latest
3631
strategy:
3732
fail-fast: false

docker/Dockerfile.lvperf_32b

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ RUN cd u-boot;\
3030

3131
FROM baseimage AS runner
3232

33-
RUN apk update; \
34-
apk add --no-cache make cmake gcc-arm-none-eabi \
35-
g++-arm-none-eabi qemu-system-arm \
36-
util-linux dtc u-boot-tools dosfstools python3 py3-pip
33+
RUN apt-get update \
34+
&& DEBIAN_FRONTEND=noninteractive apt install -y \
35+
make cmake gcc-arm-none-eabi g++-arm-none-eabi qemu-system-arm \
36+
util-linux device-tree-compiler u-boot-tools dosfstools python3 \
37+
python3-pip \
38+
&& rm -rf /var/lib/apt/lists/*
3739

3840
RUN pip install --break-system-packages pcpp
3941

0 commit comments

Comments
 (0)