Skip to content

Update dockerfile to build #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update dockerfile to build #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d34fb38
Update dockerfile to build
nicholasmello Jul 9, 2023
6f5bb37
Fix warnings and optimize
nicholasmello Jul 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 15 additions & 14 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
# podman build -t los:latest -f Dockerfile .
FROM rust:1.55-alpine as builder

#FROM rust:1.57-alpine
FROM rust:alpine
run apk add --no-cache musl-dev bash

RUN apk add --no-cache musl-dev
RUN adduser --disabled-password --gecos "" liberty
USER liberty
WORKDIR /home/liberty
COPY rust-toolchain.toml .

RUN rustup target add x86_64-unknown-linux-gnu
RUN rustup default nightly
RUN rustup component add \
rust-src \
llvm-tools-preview
RUN rustup component add rust-src
RUN rustup component add llvm-tools-preview
RUN cargo install bootimage
RUN rustup default nightly
RUN rustup update nightly

# bring in the code from your git clone
COPY . .
# put the image in a known location
RUN cargo install --debug --root /usr/local --path .
RUN cargo build

RUN touch copy.sh
RUN echo -e "#!/bin/sh\ncp -r ./target/* /mnt/target" > copy.sh

# A container must be created before extracting the kernel.
# los=$(podman create --name mylos los:latest)
# podman cp $los:/usr/local/bin/libertyos_kernel .
CMD ["/bin/sh", "/home/liberty/copy.sh"]
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2022-01-07"
channel = "nightly-2023-01-07"
components = [ "rust-src", "clippy", "rustfmt", "rustc", "rust-std", "llvm-tools-preview" ]
targets = [ "x86_64-unknown-linux-gnu" ]
2 changes: 0 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
#![allow(unused_variables)]
#![feature(abi_x86_interrupt)]
#![feature(alloc_error_handler)]
#![feature(asm_sym)]
#![feature(const_fn_fn_ptr_basics)]
#![feature(const_mut_refs)]
#![feature(core_intrinsics)]
#![feature(custom_test_frameworks)]
Expand Down