Skip to content

Commit 42e7465

Browse files
Build from debian, remove deps we no longer need
xvfb is the important package for the entrypoint to work, everything else was for the pre-appimage version of Citra
1 parent 7b5f672 commit 42e7465

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

run-tests/Dockerfile

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM buildpack-deps:latest as builder
1+
FROM buildpack-deps:latest AS builder
22

33
WORKDIR /tmp
44
COPY ./docker/download_emulator.sh /usr/local/bin/download_emulator
@@ -7,7 +7,7 @@ RUN apt-get update -y && apt-get install -y jq
77
ARG EMU_TAG=2120.2
88
RUN download_emulator ${EMU_TAG}
99

10-
FROM devkitpro/devkitarm:latest as devkitarm
10+
FROM devkitpro/devkitarm:latest AS devkitarm
1111

1212
# For some reason, the emulator isn't always happy when you try to run it for the first time,
1313
# so we build a simple dummy program to force it to create its directory structure
@@ -16,18 +16,12 @@ RUN cd /opt/devkitpro/examples/3ds/graphics/printing/hello-world && \
1616
make && \
1717
mv hello-world.3dsx /tmp/
1818

19-
FROM ubuntu:mantic
19+
FROM debian:bullseye
2020

2121
RUN --mount=type=cache,sharing=locked,target=/var/cache/apt \
2222
apt-get update -y && \
2323
apt-get install -y \
24-
libavfilter9 \
25-
libavformat60 \
26-
libavutil58 \
27-
libsdl2-2.0-0 \
28-
libswscale7 \
29-
mesa-vulkan-drivers \
30-
vulkan-tools \
24+
libncursesw6 \
3125
xvfb
3226

3327
COPY --from=devkitarm /opt/devkitpro /opt/devkitpro

0 commit comments

Comments
 (0)