Skip to content

Commit

Permalink
separate out rust and main toolchains
Browse files Browse the repository at this point in the history
  • Loading branch information
lacraig2 committed Oct 10, 2023
1 parent c93f345 commit 719a149
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,7 @@ jobs:

- name: Build
run: |
docker build -t ghcr.io/${{ github.repository }}:latest .
docker push ghcr.io/${{ github.repository }}:latest
docker build -t ghcr.io/${{ github.repository }}:latest --target base .
docker build -t ghcr.io/${{ github.repository }}_rust:latest .
docker push ghcr.io/${{ github.repository }}:latest
docker push ghcr.io/${{ github.repository }}_rust:latest
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:22.04
FROM ubuntu:22.04 as base
RUN apt-get update
RUN apt-get -y install build-essential gdb xonsh git wget libncurses-dev bc curl
RUN apt-get -y install build-essential git wget libncurses-dev bc curl
RUN mkdir -p /opt/cross

# musl-cross i686
Expand Down Expand Up @@ -47,6 +47,7 @@ ENV PATH="/opt/cross/aarch64-linux-musl/bin/:${PATH}"
RUN wget https://musl.cc/aarch64-linux-musl-cross.tgz -O - | tar -xz -C /opt/cross && ln -s /opt/cross/aarch64-linux-musl-cross /opt/cross/aarch64-linux-musl

# rust
FROM base as rust
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal
ENV PATH="/root/.cargo/bin:${PATH}"
# XXX: pin rust version to 1.71 until we figure out a workaround for mips linux being demoted to tier 3
Expand Down

0 comments on commit 719a149

Please sign in to comment.