Archive/Portal64
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #506 from hackgrid/docker-1

Browse source 
upgrade docker image to Ubuntu 23.04 to fix build
This commit is contained in:
lambertjamesd 2023-11-28 08:22:44 -07:00 committed by GitHub
parent 3d6db71f92 efbc1fea76
commit 2389f8c11d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Dockerfile
View file

@ -1,9 +1,10 @@
from ubuntu:22.04
from ubuntu:23.04
WORKDIR /usr/src/app
ENV N64_LIBGCCDIR /opt/crashsdk/lib/gcc/mips64-elf/12.2.0
ENV PATH /opt/crashsdk/bin:$PATH
ENV PATH /root/.local/bin:$PATH
ENV ROOT /etc/n64
RUN apt update -y && \
@ -30,6 +31,7 @@ RUN apt update -y && \
libgl1 \
python3 \
pip \
pipx \
imagemagick \
libpng-dev \
libtiff-dev \
@ -56,4 +58,5 @@ RUN rm /opt/blender/blender-3.6.1-linux-x64.tar.xz
ENV BLENDER_3_6 /opt/blender/blender-3.6.1-linux-x64/blender
RUN pip install vpk
RUN pipx ensurepath
RUN pipx install vpk

22
Makefile.docker
View file

@ -8,8 +8,28 @@ convert_all_png:
docker run -v $$PWD:/usr/src/app -it portal64 make convert_all_png
bash:
docker run -v $$PWD:/usr/src/app -it portal64 bash
docker run -v $$PWD:/usr/src/app -it portal64 bash
clean:
sudo rm -rf build
sudo rm -rf portal_pak_dir
sudo rm -rf portal_pak_modified
sudo rm -rf assets/locales/
english_audio:
docker run -v $$PWD:/usr/src/app -it portal64 make english_audio
all_languages:
docker run -v $$PWD:/usr/src/app -it portal64 make all_languages
german_audio:
docker run -v $$PWD:/usr/src/app -it portal64 make german_audio
french_audio:
docker run -v $$PWD:/usr/src/app -it portal64 make french_audio
russian_audio:
docker run -v $$PWD:/usr/src/app -it portal64 make russian_audio
spanish_audio:
docker run -v $$PWD:/usr/src/app -it portal64 make spanish_audio