Update docker image

This commit is contained in:
James Lambert 2023-09-02 08:52:31 -06:00
parent ec52a15372
commit bf08ffeeb8
4 changed files with 36 additions and 8 deletions

View file

@ -1 +1,6 @@
*
build
vpk
skelatool64/build
skelatool64/cimg
skelatool64/yaml-cpp
skelatool64/skeletool64

View file

@ -5,7 +5,6 @@ WORKDIR /usr/src/app
ENV N64_LIBGCCDIR /opt/crashsdk/lib/gcc/mips64-elf/12.2.0
ENV PATH /opt/crashsdk/bin:$PATH
ENV ROOT /etc/n64
ENV BLENDER_3_0 /usr/bin/blender
RUN apt update -y && \
DEBIAN_FRONTEND=noninteractive apt install -y \
@ -46,6 +45,27 @@ RUN apt update -y && \
liblua5.4-dev \
liblua5.4-0 \
blender \
mpg123
mpg123 \
wget
RUN wget https://download.blender.org/release/Blender3.0/blender-3.0.0-linux-x64.tar.xz
RUN tar -xf blender-3.0.0-linux-x64.tar.xz
ENV BLENDER_3_0 /usr/src/app/blender-3.0.0-linux-x64/blender
RUN pip install vpk
COPY ./asm ./asm
COPY ./assets ./assets
COPY ./skelatool64 ./skelatool64
COPY ./src ./src
COPY ./tools ./tools
COPY ./Makefile ./Makefile
COPY ./portal.ld ./portal.ld
WORKDIR /usr/src/app/skelatool64
RUN ./setup_dependencies.sh
RUN make
WORKDIR /usr/src/app

View file

@ -1,11 +1,11 @@
all:
docker run -v $$PWD:/usr/src/app -it portal64 make
docker run -v $$PWD/src:/usr/src/app/src -v $$PWD/build:/usr/src/app/build -v $$PWD/portal.ld:/usr/src/app/portal.ld -v $$PWD/vpk:/usr/src/app/vpk -it portal64 make
build:
image:
docker build -t portal64 .
bash:
docker run -v $$PWD:/usr/src/app -it portal64 bash
docker run -v $$PWD/src:/usr/src/app/src -v $$PWD/build:/usr/src/app/build -v $$PWD/portal.ld:/usr/src/app/portal.ld -v $$PWD/vpk:/usr/src/app/vpk -it portal64 bash
clean:
sudo rm -rf build

View file

@ -105,19 +105,22 @@ make fix
## Build with Docker
Using the docker image the only setup step you need is to populating the vpk folder. After that you can build the docker image using
Build the Docker image.
```sh
make -f Makefile.docker build
make -f Makefile.docker image
```
<br />
Then build.
Then build the rom using
```sh
make -f Makefile.docker
```
That will generate the rom at `/build/portal64.z64`
<br />
## Current New Feature TODO List