whimsical-c4lic0/OF-DL
1
0
Fork 0
forked from sim0n00ps/OF-DL
Code Pull Requests Activity

Add GUI application to docker

Browse Source
This commit is contained in:
whimsical-c4lic0 2026-02-18 10:17:14 -06:00
parent f9089a339a
commit 6b7cb29e2e
5 changed files with 68 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile
View File

@ -6,14 +6,16 @@ ARG VERSION
COPY ["OF DL.sln", "/src/OF DL.sln"] COPY ["OF DL.sln", "/src/OF DL.sln"]
COPY ["OF DL", "/src/OF DL"] COPY ["OF DL", "/src/OF DL"]
COPY ["OF DL.Core", "/src/OF DL.Core"] COPY ["OF DL.Core", "/src/OF DL.Core"]
COPY ["OF DL.Gui", "/src/OF DL.Gui"]
WORKDIR "/src" WORKDIR "/src"
# Build release # Build release
RUN dotnet publish "OF DL/OF DL.csproj" -p:WarningLevel=0 -p:Version=$VERSION -c Release -o out RUN dotnet publish "OF DL.Gui/OF DL.Gui.csproj" -p:WarningLevel=0 -p:Version=$VERSION -c Release -o outgui
RUN dotnet publish "OF DL/OF DL.csproj" -p:WarningLevel=0 -p:Version=$VERSION -c Release -o outcli
# Generate default config.conf files # Generate default config.conf files
RUN /src/out/OF\ DL --non-interactive || true && \ RUN /src/outcli/OF\ DL --non-interactive || true && \
# Set download path in default config.conf to /data # Set download path in default config.conf to /data
sed -e 's/DownloadPath = ""/DownloadPath = "\/data"/' /src/config.conf > /src/updated_config.conf && \ sed -e 's/DownloadPath = ""/DownloadPath = "\/data"/' /src/config.conf > /src/updated_config.conf && \
mv /src/updated_config.conf /src/config.conf mv /src/updated_config.conf /src/config.conf
@ -31,6 +33,7 @@ RUN apt-get update \
x11vnc \ x11vnc \
novnc \ novnc \
npm \ npm \
openbox \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN npx playwright install-deps RUN npx playwright install-deps
@ -45,7 +48,8 @@ RUN echo "<!DOCTYPE html><html><head><meta http-equiv=\"Refresh\" content=\"0; u
RUN mkdir /data /config /config/logs /default-config RUN mkdir /data /config /config/logs /default-config
# Copy release # Copy release
COPY --from=build /src/out /app COPY --from=build /src/outcli /app/cli
COPY --from=build /src/outgui /app/gui
# Copy default configuration files # Copy default configuration files
COPY --from=build /src/config.conf /default-config COPY --from=build /src/config.conf /default-config
@ -64,5 +68,5 @@ ENV DEBIAN_FRONTEND="noninteractive" \
EXPOSE 8080 EXPOSE 8080
WORKDIR /config WORKDIR /config
ENTRYPOINT ["/usr/bin/tini", "--"] ENTRYPOINT ["/usr/bin/tini", "--", "/app/entrypoint.sh"]
CMD ["/app/entrypoint.sh"] CMD []

7
OF DL.Gui/Program.cs
View File

@ -21,6 +21,13 @@ public static class Program
Log.Information("Starting OF DL GUI"); Log.Information("Starting OF DL GUI");
// Check if running in Docker and print message
string? ofdlDocker = Environment.GetEnvironmentVariable("OFDL_DOCKER");
if (string.Equals(ofdlDocker, "true", StringComparison.OrdinalIgnoreCase))
{
Console.WriteLine("In your web browser, navigate to the port forwarded from your docker container. For instance, if your docker run command included \"-p 8080:8080\", open your web browser to \"http://localhost:8080\".");
}
BuildAvaloniaApp() BuildAvaloniaApp()
.StartWithClassicDesktopLifetime(args); .StartWithClassicDesktopLifetime(args);
} }

8
OF DL.Gui/Views/MainWindow.axaml.cs
View File

@ -26,6 +26,14 @@ public partial class MainWindow : Window
{ {
InitializeComponent(); InitializeComponent();
Icon = new WindowIcon(AssetLoader.Open(new Uri("avares://OF DL.Gui/Assets/icon.ico"))); Icon = new WindowIcon(AssetLoader.Open(new Uri("avares://OF DL.Gui/Assets/icon.ico")));
// Start maximized if running in Docker
string? ofdlDocker = Environment.GetEnvironmentVariable("OFDL_DOCKER");
if (string.Equals(ofdlDocker, "true", StringComparison.OrdinalIgnoreCase))
{
WindowState = WindowState.Maximized;
}
Opened += OnOpened; Opened += OnOpened;
Closed += OnClosed; Closed += OnClosed;
} }

48
docker/entrypoint.sh
View File

@ -12,15 +12,45 @@ if [ ! -f /config/rules.json ]; then
cp /default-config/rules.json /config/rules.json cp /default-config/rules.json /config/rules.json
fi fi
{ # Check if --cli flag was passed
supervisord -c /etc/supervisor/conf.d/supervisord.conf & if [[ " $@ " =~ " --cli " ]]; then
} &> /dev/null # CLI mode - no need for X server
# Remove --cli from arguments
args=("$@")
filtered_args=()
for arg in "${args[@]}"; do
if [ "$arg" != "--cli" ]; then
filtered_args+=("$arg")
fi
done
# Wait for the 3 supervisor programs to start: X11 (Xvfb), X11vnc, and noVNC /app/cli/OF\ DL "${filtered_args[@]}"
NUM_RUNNING_SERVICES=$(supervisorctl -c /etc/supervisor/conf.d/supervisord.conf status | grep RUNNING | wc -l) else
while [ $NUM_RUNNING_SERVICES != "3" ]; do # GUI mode - start X server and window manager
sleep 1 {
supervisord -c /etc/supervisor/conf.d/supervisord.conf &
} &> /dev/null
# Wait for the 4 supervisor programs to start: X11 (Xvfb), openbox, X11vnc, and noVNC
NUM_RUNNING_SERVICES=$(supervisorctl -c /etc/supervisor/conf.d/supervisord.conf status | grep RUNNING | wc -l) NUM_RUNNING_SERVICES=$(supervisorctl -c /etc/supervisor/conf.d/supervisord.conf status | grep RUNNING | wc -l)
done while [ $NUM_RUNNING_SERVICES != "4" ]; do
sleep 1
NUM_RUNNING_SERVICES=$(supervisorctl -c /etc/supervisor/conf.d/supervisord.conf status | grep RUNNING | wc -l)
done
/app/OF\ DL # Wait for X server to be ready to accept connections
echo "Waiting for X server to be ready..."
timeout=30
elapsed=0
until xdpyinfo -display "$DISPLAY" >/dev/null 2>&1; do
if [ $elapsed -ge $timeout ]; then
echo "Timeout waiting for X server"
exit 1
fi
sleep 1
elapsed=$((elapsed + 1))
done
echo "X server is ready"
/app/gui/OF\ DL.Gui "$@"
fi

5
docker/supervisord.conf
View File

@ -16,6 +16,11 @@ serverurl=unix:///tmp/supervisor.sock
command=Xvfb :0 -screen 0 "%(ENV_DISPLAY_WIDTH)s"x"%(ENV_DISPLAY_HEIGHT)s"x24 command=Xvfb :0 -screen 0 "%(ENV_DISPLAY_WIDTH)s"x"%(ENV_DISPLAY_HEIGHT)s"x24
autorestart=true autorestart=true
[program:openbox]
command=openbox
environment=DISPLAY=":0"
autorestart=true
[program:x11vnc] [program:x11vnc]
command=/usr/bin/x11vnc command=/usr/bin/x11vnc
autorestart=true autorestart=true