Merge pull request #506 from hackgrid/docker-1
upgrade docker image to Ubuntu 23.04 to fix build
This commit is contained in:
commit
2389f8c11d
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue