Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Work in progress data saving and VNC #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
app/*.rpm
app/*.tar.bz2

data/*

zzz_gamestart_login.cos
offlinelogin.c16
15 changes: 14 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,14 @@ FROM i386/debian:bullseye
RUN apt-get update
RUN apt-get -y install rpm2cpio bzip2 libxi6 libc6 binutils

RUN apt-get install -y x11vnc tightvncserver xvfb
RUN mkdir ~/.vnc
RUN x11vnc -storepasswd 1234 ~/.vnc/passwd
COPY xstartup ~/.vnc/xstartup
RUN touch ~/.Xauthority
RUN mkdir -p /home/ds/app
COPY ./app/ /home/ds/app/
COPY ./start-vncserver.sh /home/ds/app/start-vncserver.sh

WORKDIR /home/ds/app

Expand All @@ -25,4 +31,11 @@ RUN export LD_LIBRARY_PATH=/home/ds/app && ./install.sh; exit 0

RUN rm libSDL-1.2.so*

RUN apt-get remove -y rpm2cpio
ENV DEST "/home/ds/app/Bootstrap/010\ Docking\ Station/zzz_gamestart_login.cos"

COPY ./offlinelogin.c16 /home/ds/app/Images/offlinelogin.c16
COPY ./zzz_gamestart_login.cos ${DEST}

RUN apt-get remove -y rpm2cpio

CMD [ "/home/ds/app/start-vncserver.sh" ]
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ A proof of concept implementation for dockerizing the linux version of Docking S

Add `dockingstation_195_64.tar.bz2`, `glib-1.2.10-55.fc30.i686.rpm`, `gtk+-1.2.10-90.fc30.i686.rpm` and `SDL-1.2.9-1.i386.rpm` to `./app`

Add `offlinelogin.c16` and `zzz_gamestart_login.cos` from the offline login hack

# usage (mac os x)

run `./launch-osx-xquartz.sh` after ensuring you have changed the settings to allow incomming network connections and restarted!

# usage (vnc)

run `launch-tightvnc-server-15-bit.sh` and login to VNC server: vnc://localhost:5901
7 changes: 7 additions & 0 deletions app/launch.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export REALLY_RUN_AS_ROOT=1
export TERM=xterm-256color
export LD_LIBRARY_PATH=/home/ds/app/usr/lib
export INSTALL_DEST=/home/ds/app
export BIN_DEST=/home/ds/app/bin

/home/ds/app/bin/dockingstation nocheck
11 changes: 7 additions & 4 deletions launch-osx-xquartz.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
brew install pulseaudio
brew services start pulseaudio
pulseaudio --check -v
#!/bin/bash

./prepare.sh

xhost + 127.0.0.1

Expand All @@ -12,4 +12,7 @@ docker run \
-e INSTALL_DEST=/home/ds/app \
-e BIN_DEST=/home/ds/app/bin \
-v /tmp/.X11-unix:/tmp/.X11-unix \
dockerds /home/ds/app/bin/dockingstation nocheck
-v $PWD/data:/root/.dockingstation \
dockerds /home/ds/app/bin/dockingstation nocheck

./save.sh
7 changes: 7 additions & 0 deletions launch-tightvnc-server-15-bit.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

./prepare.sh

docker run -v $PWD/data:/root/.dockingstation -p 5901:5901 dockerds

./save.sh
5 changes: 5 additions & 0 deletions prepare.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash

docker create -ti --name dummy dockerds bash
docker cp dummy:"/root/.dockingstation" "./data/"
docker rm -f dummy
4 changes: 4 additions & 0 deletions start-vncserver.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

export USER=root
vncserver :1 -geometry 1280x800 -depth 15 && tail -F /root/.vnc/*.log
5,743 changes: 5,743 additions & 0 deletions test

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions xstartup
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/home/ds/app/launch.sh