Skip to content

Commit

Permalink
Workaround japaric/xargo#189
Browse files Browse the repository at this point in the history
Cleanup.
  • Loading branch information
chris13524 committed Jan 22, 2018
1 parent 799c2fd commit f4a7698
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
9 changes: 9 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,15 @@ build/boot.img: $(TARGET)
@$(MMD) -i fat.img ::/EFI/BOOT
@$(MCOPY) -i fat.img $(TARGET) ::/EFI/BOOT
@mv fat.img $(BUILD_ROOT)/$(HD_IMG)

img-docker: clean # clean is necessary, see https://github.com/japaric/xargo/issues/189
docker build -t projectasiago/aura.build .
docker run -it --rm \
-e LOCAL_UID="$(shell id -u)" -e LOCAL_GID="$(shell id -g)" \
-v aura-"$(id -u)-$(id -g)"-cargo:/usr/local/cargo \
-v "$(shell pwd)":/usr/src/aura \
-w /usr/src/aura projectasiago/aura.build \
make img

clean:
@$(CARGO) clean
Expand Down
2 changes: 1 addition & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ CACHED_UID=$(stat -c "%u" $TESTFILE)
CACHED_GID=$(stat -c "%g" $TESTFILE)

if [ $CACHED_UID != $RUN_UID ] || [ $RUN_GID != $CACHED_GID ]; then
echo -e "\033[01;38;5;155mChanging user id:group to ${RUN_UID}:${RUN_GID}. Please wait...\033[0m"
echo -e "Changing user id:group to ${RUN_UID}:${RUN_GID}. Please wait..."
chown $RUN_UID:$RUN_GID -R $CARGO_HOME $RUSTUP_HOME $TOOLCHAIN_HOME
fi

Expand Down

0 comments on commit f4a7698

Please sign in to comment.