mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
Refactor dockerfiles and ci docker.yml
This commit is contained in:
parent
3a8b3a5f6e
commit
63b5c92b5c
4 changed files with 54 additions and 153 deletions
116
.github/workflows/docker.yml
vendored
116
.github/workflows/docker.yml
vendored
|
|
@ -1,9 +1,10 @@
|
||||||
name: Build dabao and bao1x-boot firmware
|
name: Docker - build baochip firmware
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
- docker-*
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
|
@ -11,19 +12,32 @@ on:
|
||||||
env:
|
env:
|
||||||
REGISTRY: ghcr.io
|
REGISTRY: ghcr.io
|
||||||
IMAGE_PREFIX: ${{ github.repository }}
|
IMAGE_PREFIX: ${{ github.repository }}
|
||||||
RUST_IMAGE_SHA256: f7a4434bddc5865c07ec0e2804fcde20e9898a2b4c12cac53b22310550a8d6f5
|
RUST_IMAGE_SHA256: 5fdb652f0f6e83c24ebbba6d9c51a9836c6f3c4fa12dc3040e6327c6eb355769
|
||||||
|
RUST_VERSION: 1.93.0
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-apps-dabao:
|
docker-build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
packages: write
|
packages: write
|
||||||
strategy:
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
app:
|
task:
|
||||||
- helloworld
|
- name: dabao
|
||||||
- dabao-console
|
os: xous
|
||||||
|
- name: baosec
|
||||||
|
os: xous
|
||||||
|
- name: bao1x-boot0
|
||||||
|
os: none
|
||||||
|
- name: bao1x-boot1
|
||||||
|
os: none
|
||||||
|
- name: bao1x-alt-boot1
|
||||||
|
os: none
|
||||||
|
- name: bao1x-baremetal-dabao
|
||||||
|
os: none
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
@ -54,102 +68,40 @@ jobs:
|
||||||
id: meta
|
id: meta
|
||||||
uses: docker/metadata-action@v5
|
uses: docker/metadata-action@v5
|
||||||
with:
|
with:
|
||||||
images: ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/dabao-${{ matrix.app }}
|
images: ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/${{ matrix.task.name }}
|
||||||
tags: |
|
tags: |
|
||||||
type=ref,event=branch
|
type=ref,event=branch
|
||||||
type=ref,event=pr
|
type=ref,event=pr
|
||||||
type=sha,prefix=sha-
|
type=sha,prefix=sha-
|
||||||
type=raw,value=latest,enable={{is_default_branch}}
|
type=raw,value=latest,enable={{is_default_branch}}
|
||||||
|
|
||||||
|
- name: Build ${{ matrix.task.name }} firmware
|
||||||
- name: Build dabao ${{ matrix.app }} app firmware (uf2 files)
|
|
||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v5
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
file: ./apps-dabao/Dockerfile
|
file: ./Dockerfile
|
||||||
build-args: |
|
build-args: |
|
||||||
app=${{ matrix.app }}
|
RUST_VERSION=${{ env.RUST_VERSION }}
|
||||||
IMG_SHA256=${{ env.RUST_IMAGE_SHA256 }}
|
IMG_SHA256=${{ env.RUST_IMAGE_SHA256 }}
|
||||||
|
task=${{ matrix.task.name }}
|
||||||
|
os=${{ matrix.task.os }}
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
push: ${{ github.event_name != 'pull_request' }}
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
cache-from: type=gha,scope=${{ matrix.app }}
|
cache-from: |
|
||||||
cache-to: type=gha,mode=max,scope=${{ matrix.app }},ignore-error=true
|
type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/cache:${{ matrix.task.name }}
|
||||||
|
type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/cache:base
|
||||||
|
cache-to: ${{ github.event_name != 'pull_request' && format('type=registry,ref={0}/{1}/cache:{2},mode=max', env.REGISTRY, env.IMAGE_PREFIX, matrix.task.name) || '' }}
|
||||||
outputs: type=local,dest=./output
|
outputs: type=local,dest=./output
|
||||||
provenance: false
|
provenance: false
|
||||||
sbom: false
|
sbom: false
|
||||||
|
|
||||||
- name: Upload ${{ matrix.app }} app UF2 artifacts
|
- name: Upload ${{ matrix.task.name }} artifacts
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: dabao-${{ matrix.app }}-uf2
|
name: ${{ matrix.task.name }}
|
||||||
path: |
|
|
||||||
./output/*.uf2
|
|
||||||
retention-days: 90
|
|
||||||
|
|
||||||
build-bao1x-boot1:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
packages: write
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Fetch all tags
|
|
||||||
run: git fetch --prune --unshallow --tags
|
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
with:
|
|
||||||
driver-opts: |
|
|
||||||
network=host
|
|
||||||
image=moby/buildkit:latest
|
|
||||||
|
|
||||||
- name: Configure Docker daemon for performance
|
|
||||||
run: |
|
|
||||||
echo '{"max-concurrent-downloads": 10, "max-concurrent-uploads": 10}' | sudo tee /etc/docker/daemon.json
|
|
||||||
sudo systemctl restart docker
|
|
||||||
|
|
||||||
- name: Log in to GitHub Container Registry
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
registry: ${{ env.REGISTRY }}
|
|
||||||
username: ${{ github.actor }}
|
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
|
|
||||||
- name: Extract metadata
|
|
||||||
id: meta
|
|
||||||
uses: docker/metadata-action@v5
|
|
||||||
with:
|
|
||||||
images: ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/bao1x-boot
|
|
||||||
tags: |
|
|
||||||
type=ref,event=branch
|
|
||||||
type=ref,event=pr
|
|
||||||
type=sha,prefix=sha-
|
|
||||||
type=raw,value=latest,enable={{is_default_branch}}
|
|
||||||
|
|
||||||
|
|
||||||
- name: Build bao1x boot1 firmware (uf2 files)
|
|
||||||
uses: docker/build-push-action@v5
|
|
||||||
with:
|
|
||||||
context: .
|
|
||||||
file: ./bao1x-boot/Dockerfile
|
|
||||||
build-args: |
|
|
||||||
IMG_SHA256=${{ env.RUST_IMAGE_SHA256 }}
|
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
|
||||||
cache-from: type=gha,scope=bao1x-boot
|
|
||||||
cache-to: type=gha,mode=max,scope=bao1x-boot,ignore-error=true
|
|
||||||
outputs: type=local,dest=./output
|
|
||||||
provenance: false
|
|
||||||
sbom: false
|
|
||||||
|
|
||||||
- name: Upload boot1 UF2 artifacts
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: bao1x-boot1-uf2
|
|
||||||
path: |
|
path: |
|
||||||
./output/*.uf2
|
./output/*.uf2
|
||||||
|
./output/*.img
|
||||||
|
./output/*.bin
|
||||||
retention-days: 90
|
retention-days: 90
|
||||||
|
|
|
||||||
20
Dockerfile
Normal file
20
Dockerfile
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
ARG RUST_VERSION="1.93.0"
|
||||||
|
ARG IMG_SHA256=""
|
||||||
|
|
||||||
|
FROM ghcr.io/sbellem/rust-xous:${RUST_VERSION}-slim-bullseye${IMG_SHA256:+@sha256:${IMG_SHA256}} AS builder
|
||||||
|
ARG task="dabao"
|
||||||
|
ARG app=""
|
||||||
|
ARG os="xous"
|
||||||
|
|
||||||
|
WORKDIR /home/baozi/xous-core
|
||||||
|
COPY --chown=baozi:baozi . .
|
||||||
|
RUN --mount=type=cache,target=/usr/local/cargo/registry,uid=1000,gid=1000 \
|
||||||
|
--mount=type=cache,target=/home/baozi/xous-core/target,uid=1000,gid=1000 \
|
||||||
|
cargo --locked xtask "${task}" ${app:+"${app}"} --no-verify \
|
||||||
|
&& mkdir -p artifacts \
|
||||||
|
&& cp target/riscv32imac-unknown-${os}-elf/release/*.uf2 artifacts/ 2>/dev/null || true \
|
||||||
|
&& cp target/riscv32imac-unknown-${os}-elf/release/*.img artifacts/ 2>/dev/null || true \
|
||||||
|
&& cp target/riscv32imac-unknown-${os}-elf/release/*.bin artifacts/ 2>/dev/null || true
|
||||||
|
|
||||||
|
FROM scratch
|
||||||
|
COPY --from=builder /home/baozi/xous-core/artifacts/ /
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
ARG RUST_VERSION="1.92.0"
|
|
||||||
ARG IMG_SHA256=""
|
|
||||||
FROM rust:${RUST_VERSION}-slim-bullseye${IMG_SHA256:+@sha256:${IMG_SHA256}} AS toolchain
|
|
||||||
|
|
||||||
ARG EXTRA="1"
|
|
||||||
|
|
||||||
RUN set -eux; \
|
|
||||||
apt-get update && apt-get install -y --no-install-recommends \
|
|
||||||
curl \
|
|
||||||
git \
|
|
||||||
unzip \
|
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
|
||||||
&& download_url="https://github.com/betrusted-io/rust/releases/download"; \
|
|
||||||
zipfile="riscv32imac-unknown-xous_${RUST_VERSION}.zip"; \
|
|
||||||
curl --proto '=https' --tlsv1.2 -fsSL -O "${download_url}/${RUST_VERSION}.${EXTRA}/${zipfile}"; \
|
|
||||||
sha256="fc7e7210444ee33c96956c4015eeafe96a588c12d68385ad763a4d1f3c6ec811"; \
|
|
||||||
echo "${sha256} *${zipfile}" | sha256sum --strict --check -; \
|
|
||||||
unzip "${zipfile}" -d "$(rustc --print sysroot)"; \
|
|
||||||
rm "${zipfile}"
|
|
||||||
|
|
||||||
RUN rustup target add riscv32imac-unknown-none-elf
|
|
||||||
|
|
||||||
|
|
||||||
FROM toolchain AS builder
|
|
||||||
ARG app="helloworld"
|
|
||||||
RUN useradd --create-home --uid 1000 baozi
|
|
||||||
USER baozi
|
|
||||||
WORKDIR /home/baozi/xous-core
|
|
||||||
COPY --chown=baozi:baozi . .
|
|
||||||
RUN --mount=type=cache,target=/home/baozi/.cargo/registry,uid=1000,gid=1000 cargo --locked xtask dabao "${app}"
|
|
||||||
|
|
||||||
|
|
||||||
FROM scratch
|
|
||||||
COPY --from=builder /home/baozi/xous-core/target/riscv32imac-unknown-xous-elf/release/apps.uf2 /
|
|
||||||
COPY --from=builder /home/baozi/xous-core/target/riscv32imac-unknown-xous-elf/release/loader.uf2 /
|
|
||||||
COPY --from=builder /home/baozi/xous-core/target/riscv32imac-unknown-xous-elf/release/xous.uf2 /
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
ARG RUST_VERSION="1.92.0"
|
|
||||||
ARG IMG_SHA256=""
|
|
||||||
FROM rust:${RUST_VERSION}-slim-bullseye${IMG_SHA256:+@sha256:${IMG_SHA256}} AS toolchain
|
|
||||||
|
|
||||||
ARG EXTRA="1"
|
|
||||||
|
|
||||||
RUN set -eux; \
|
|
||||||
apt-get update && apt-get install -y --no-install-recommends \
|
|
||||||
curl \
|
|
||||||
git \
|
|
||||||
unzip \
|
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
|
||||||
&& download_url="https://github.com/betrusted-io/rust/releases/download"; \
|
|
||||||
zipfile="riscv32imac-unknown-xous_${RUST_VERSION}.zip"; \
|
|
||||||
curl --proto '=https' --tlsv1.2 -fsSL -O "${download_url}/${RUST_VERSION}.${EXTRA}/${zipfile}"; \
|
|
||||||
sha256="fc7e7210444ee33c96956c4015eeafe96a588c12d68385ad763a4d1f3c6ec811"; \
|
|
||||||
echo "${sha256} *${zipfile}" | sha256sum --strict --check -; \
|
|
||||||
unzip "${zipfile}" -d "$(rustc --print sysroot)"; \
|
|
||||||
rm "${zipfile}"
|
|
||||||
|
|
||||||
RUN rustup target add riscv32imac-unknown-none-elf
|
|
||||||
|
|
||||||
|
|
||||||
FROM toolchain AS builder
|
|
||||||
RUN useradd --create-home --uid 1000 baozi
|
|
||||||
USER baozi
|
|
||||||
WORKDIR /home/baozi/xous-core
|
|
||||||
COPY --chown=baozi:baozi . .
|
|
||||||
RUN --mount=type=cache,target=/home/baozi/.cargo/registry,uid=1000,gid=1000 cargo --locked xtask bao1x-alt-boot1
|
|
||||||
RUN --mount=type=cache,target=/home/baozi/.cargo/registry,uid=1000,gid=1000 cargo --locked xtask bao1x-boot1
|
|
||||||
|
|
||||||
|
|
||||||
FROM scratch
|
|
||||||
COPY --from=builder /home/baozi/xous-core/target/riscv32imac-unknown-none-elf/release/bao1x-boot1.uf2 /
|
|
||||||
COPY --from=builder /home/baozi/xous-core/target/riscv32imac-unknown-none-elf/release/bao1x-alt-boot1.uf2 /
|
|
||||||
Loading…
Reference in a new issue