From 1fb85d8afe34fcb0e5bfe3cba0288ddd821ab4ed Mon Sep 17 00:00:00 2001 From: moparisthebest Date: Sat, 23 Oct 2021 00:16:09 -0400 Subject: [PATCH] tweak Dockerfile --- docker/Dockerfile | 6 +++--- docker/setup-linux.sh | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 0c7f0ae..0404395 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -8,6 +8,9 @@ #FROM ubuntu:18.04 FROM ubuntu:16.04 +ENV N64_INST=/usr/local/libdragon +ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/libdragon/bin + RUN mkdir /build COPY setup-linux.sh /usr/bin/setup-linux.sh @@ -15,9 +18,6 @@ COPY setup-linux.sh /usr/bin/setup-linux.sh # run it then delete all build artifacts RUN /usr/bin/setup-linux.sh && rm -rf /root/* -ENV N64_INST=/usr/local/libdragon -ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/libdragon/bin - VOLUME [ "/build" ] WORKDIR /build diff --git a/docker/setup-linux.sh b/docker/setup-linux.sh index 439acef..d873c5e 100755 --- a/docker/setup-linux.sh +++ b/docker/setup-linux.sh @@ -89,6 +89,8 @@ cd .. apt-get -y autoremove apt-get autoclean -echo 'export N64_INST=/usr/local/libdragon' >> ~/.bashrc -echo 'export PATH="$PATH:$N64_INST/bin"' >> ~/.bashrc +find /usr/local/libdragon/bin /usr/local/libdragon/mips64-elf/bin /usr/local/libdragon/libexec/gcc/mips64-elf -type f -print0 | xargs -0 strip || true +# these are ENV in Dockerfile now +#echo 'export N64_INST=/usr/local/libdragon' >> ~/.bashrc +#echo 'export PATH="$PATH:$N64_INST/bin"' >> ~/.bashrc