Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f326deb7 authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi
Browse files

floss: Update container image 

Recent changes in rust_crates requires rustc 1.60. Also pulls in llvm-14
in the latest debian images.

Bug: 253298221
Tag: #floss
Test: ./floss/build/build-in-podman.py --image-tag floss:latest
Change-Id: Ia2d9a7ada99ada1a13570df00aaf131cf8e3d307
parent 7a30c68e

floss/build/Dockerfile

+2 −3
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ RUN apt-get update && \ 
    libdouble-conversion-dev \

    libevent-dev \

    libflatbuffers-dev \

    libflatbuffers1 \

    libgl1-mesa-dev \

    libglib2.0-dev \

    libgtest-dev \
@@ -60,7 +59,7 @@ RUN apt-get update && \ 
# Next install the Rust toolchain. Download the toolchain to the local folder

# using curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs

ADD rustup/rustup.sh /tmp

RUN /tmp/rustup.sh -y --default-toolchain 1.59.0

RUN /tmp/rustup.sh -y --default-toolchain 1.60.0



# Add .cargo/bin to $PATH

ENV PATH="/root/.cargo/bin:${PATH}"
@@ -71,7 +70,7 @@ RUN cargo install cxxbridge-cmd --version 1.0.42 
# Rename llvm packages. By default, they are named 11vm-ar-13, etc. which won't

# work properly with the build.

ADD llvm-rename.sh /tmp

RUN /tmp/llvm-rename.sh 13

RUN /tmp/llvm-rename.sh 14



# At this point, the base container is ready. Now we need to build and install

# both libchrome and modp-b64. If you ran this via `docker-build-image.py`, this