xemu-project/xemu-test
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu-test.git synced 2024-11-23 01:49:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Dockerfile data image composition

Browse Source
This commit is contained in:
Matt Borgerson 2022-03-22 14:51:54 -07:00
parent 5c32de4084
commit 3048604cb9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -1,7 +1,7 @@
# #
# Build test data # Build test data
# #
FROM ghcr.io/xboxdev/nxdk AS data FROM ghcr.io/xboxdev/nxdk AS test-xbe-data
RUN mkdir /data RUN mkdir /data
COPY test-xbe /test-xbe COPY test-xbe /test-xbe
@ -37,6 +37,10 @@ RUN make -C /test-pgraph/nxdk_pgraph_tests \
RUN cp /test-pgraph/nxdk_pgraph_tests/nxdk_pgraph_tests.iso /data/TestNXDKPgraphTests/ RUN cp /test-pgraph/nxdk_pgraph_tests/nxdk_pgraph_tests.iso /data/TestNXDKPgraphTests/
RUN cp /test-pgraph/config.cnf /data/TestNXDKPgraphTests/ RUN cp /test-pgraph/config.cnf /data/TestNXDKPgraphTests/
# Combine test data
FROM scratch AS data
COPY --from=test-xbe-data /data /data
COPY --from=pgraph-data /data/TestNXDKPgraphTests /data/TestNXDKPgraphTests
# #
# Build base test container image # Build base test container image
@ -78,6 +82,7 @@ ENV DEBIAN_FRONTEND=noninteractive
ENV SDL_AUDIODRIVER=dummy ENV SDL_AUDIODRIVER=dummy
# VNC port for debugging # VNC port for debugging
EXPOSE 5900 EXPOSE 5900
RUN mkdir /work RUN mkdir /work
@ -87,7 +92,6 @@ COPY ./scripts /work/xemu-test/scripts/
COPY ./xemutest /work/xemu-test/xemutest/ COPY ./xemutest /work/xemu-test/xemutest/
COPY ./setup.py /work/xemu-test COPY ./setup.py /work/xemu-test
COPY --from=data /data /work/xemu-test/xemutest/data COPY --from=data /data /work/xemu-test/xemutest/data
COPY --from=pgraph-data /data/TestNXDKPgraphTests /work/xemu-test/xemutest/data/TestNXDKPgraphTests
RUN pip install /work/xemu-test RUN pip install /work/xemu-test
ENTRYPOINT ["/docker_entry.sh"] ENTRYPOINT ["/docker_entry.sh"]
CMD ["/usr/bin/python3", "-m", "xemutest", "/work/private", "/work/results"] CMD ["/usr/bin/python3", "-m", "xemutest", "/work/private", "/work/results"]

0
scripts/build_test_data.sh Normal file → Executable file
View File