moparisthebest
/
altra64
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweak Dockerfile

This commit is contained in:
Travis Burtrum 2021-10-23 00:16:09 -04:00
parent 3733e676f9
commit 1fb85d8afe
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/Dockerfile
View File

@ -8,6 +8,9 @@
#FROM ubuntu:18.04 #FROM ubuntu:18.04
FROM ubuntu:16.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 RUN mkdir /build
COPY setup-linux.sh /usr/bin/setup-linux.sh 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 it then delete all build artifacts
RUN /usr/bin/setup-linux.sh && rm -rf /root/* 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" ] VOLUME [ "/build" ]
WORKDIR /build WORKDIR /build

6
docker/setup-linux.sh
View File

@ -89,6 +89,8 @@ cd ..
apt-get -y autoremove apt-get -y autoremove
apt-get autoclean apt-get autoclean
echo 'export N64_INST=/usr/local/libdragon' >> ~/.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
echo 'export PATH="$PATH:$N64_INST/bin"' >> ~/.bashrc
# these are ENV in Dockerfile now
#echo 'export N64_INST=/usr/local/libdragon' >> ~/.bashrc
#echo 'export PATH="$PATH:$N64_INST/bin"' >> ~/.bashrc