mirror of
https://github.com/Xeeynamo/sotn-decomp.git
synced 2024-10-06 18:13:30 +00:00
Add bsdmainutils to requirements (#1667)
- `column` util was missing from the Docker image, added it and organised the requirements file so it's more human friendly - rearranged the USER argument in the Dockerfile to avoid the scenario where you didnt specify the user and so lose the layers where apt installed all the packages - add the python deps at the end to ensure docker can reuse cached layers if a python dep changes. - update maspsx (I wanted to test latest maspsx against sotn, so this is what led to the other changes!)
This commit is contained in:
parent
05a3ce0211
commit
f573a99ec1
19
Dockerfile
19
Dockerfile
@ -6,22 +6,21 @@
|
|||||||
|
|
||||||
# make extract -j && make build -j
|
# make extract -j && make build -j
|
||||||
FROM ubuntu:22.04
|
FROM ubuntu:22.04
|
||||||
|
ADD /tools/requirements-debian.txt /tools/requirements-debian.txt
|
||||||
|
RUN apt-get update && apt-get install -y $(cat /tools/requirements-debian.txt)
|
||||||
|
|
||||||
|
WORKDIR /sotn
|
||||||
ARG USER
|
ARG USER
|
||||||
RUN adduser ${USER}
|
RUN adduser ${USER}
|
||||||
RUN apt-get update
|
|
||||||
ADD tools tools
|
|
||||||
RUN apt-get install -y $(cat tools/requirements-debian.txt)
|
|
||||||
RUN mkdir /sotn
|
|
||||||
WORKDIR /sotn
|
|
||||||
ENV VENV_PATH=/tools/.venv
|
ENV VENV_PATH=/tools/.venv
|
||||||
RUN mkdir $VENV_PATH
|
RUN mkdir -p ${VENV_PATH}
|
||||||
RUN chown ${USER} /sotn $VENV_PATH
|
RUN chown ${USER} /sotn ${VENV_PATH}
|
||||||
USER ${USER}
|
USER ${USER}
|
||||||
# this is similar to `make python-dependencies`, however,
|
# this is similar to `make python-dependencies`, however,
|
||||||
# the Makefile is not available until a container has
|
# the Makefile is not available until a container has
|
||||||
# been created.
|
# been created.
|
||||||
RUN cd /sotn && \
|
ADD tools/requirements-python.txt /tools/requirements-python.txt
|
||||||
python3 -m venv $VENV_PATH && \
|
RUN python3 -m venv ${VENV_PATH} && \
|
||||||
. $VENV_PATH/bin/activate && \
|
. ${VENV_PATH}/bin/activate && \
|
||||||
pip install -r /tools/requirements-python.txt
|
pip install -r /tools/requirements-python.txt
|
||||||
RUN git config --global --add safe.directory /sotn
|
RUN git config --global --add safe.directory /sotn
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 7b7652969f43a461d385e78392cc7cd40e29b0a2
|
Subproject commit d2d24c407cc2f0aff0657afe3e5f0bf2e004bdba
|
@ -1 +1,15 @@
|
|||||||
git wget curl make gcc-mipsel-linux-gnu binutils-mipsel-linux-gnu clang-format python3-pip python3-venv p7zip-full bchunk unzip binutils-sh-elf cargo
|
bchunk
|
||||||
|
binutils-mipsel-linux-gnu
|
||||||
|
binutils-sh-elf
|
||||||
|
bsdmainutils
|
||||||
|
cargo
|
||||||
|
clang-format
|
||||||
|
curl
|
||||||
|
gcc-mipsel-linux-gnu
|
||||||
|
git
|
||||||
|
make
|
||||||
|
p7zip-full
|
||||||
|
python3-pip
|
||||||
|
python3-venv
|
||||||
|
unzip
|
||||||
|
wget
|
||||||
|
Loading…
Reference in New Issue
Block a user