diff --git a/Dockerfile b/Dockerfile index 035487a3..4b91b5fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,8 @@ ENV PATH="/scripts:${PATH}" # we need to transform base_image into a windows compatible filename which we can't # do in a COPY command. COPY ./dependencies/* /tmp +COPY ./requirements.txt /tmp + RUN mv /tmp/$(echo "$BASE_IMAGE" | sed 's/:/_/g')_build.txt /tmp/build_dep.txt && \ mv /tmp/$(echo "$BASE_IMAGE" | sed 's/:/_/g')_base.txt /tmp/base_dep.txt @@ -22,9 +24,9 @@ RUN [ -e /tmp/base_dep.txt ] && \ apt-get clean # Finally: Install panda debian package, you need a version that has the Dwarf2 Plugin -RUN wget https://github.com/panda-re/panda/releases/download/v1.8.23/pandare_20.04.deb -RUN command apt install -qq -y ./pandare_20.04.deb -RUN pip install pandare +RUN wget https://github.com/panda-re/panda/releases/download/v1.8.23/pandare_22.04.deb +RUN command apt install -qq -y ./pandare_22.04.deb +RUN pip install -r requirements.txt ### BUILD IMAGE - STAGE 2 FROM base AS builder @@ -40,6 +42,8 @@ FROM builder as developer COPY ./tools/ /tools COPY ./scripts /scripts -COPY setup_container.py /setup_container.py +COPY setup_container.sh /setup_container.sh + +RUN ./setup_container.sh -RUN python3 setup_container.py +# Outside your container, you need to setup your postgres and init-host settings \ No newline at end of file diff --git a/install.sh b/install.sh index 2bda9bf7..1dac87c4 100755 --- a/install.sh +++ b/install.sh @@ -54,5 +54,5 @@ pip3 install --upgrade pip pip3 install -r requirements.txt progress "Installed Python requirements" -$SUDO ./setup_container.sh +$SUDO bash setup_container.sh progress "Installed LAVA"