Skip to content

Commit 9c140c3

Browse files
committed
comment-out emwm
1 parent 6c3c41a commit 9c140c3

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,21 @@ RUN git clone https://github.com/BenWibking/Amrvis.git Amrvis3D
3434
COPY GNUmakefile Amrvis3D/GNUmakefile
3535
RUN cd Amrvis3D && git checkout no-grab-server && make DIM=3 -j`nproc`
3636

37+
## build window manager
38+
#RUN apt-get --yes -qq update && apt-get --yes -qq upgrade \
39+
# && apt-get --yes -qq install libxrandr-dev libxinerama-dev \
40+
# && apt-get --yes -qq clean \
41+
# && rm -rf /var/lib/apt/lists/*
42+
#RUN git clone https://github.com/alx210/emwm.git && cd emwm && make -j`nproc` && make install
43+
#COPY ./.Xresources /home/vscode/.Xresources
44+
3745
## copy settings
3846
COPY .bashrc /home/vscode/.bashrc
3947
COPY amrvis.defaults /home/vscode/.amrvis.defaults
4048
COPY Palette /home/vscode/Palette
4149

4250
## configure X11 server
4351
COPY ./xpra.conf /etc/xpra/xpra.conf
44-
COPY ./.Xresources /home/vscode/.Xresources
4552
COPY ./start_http_server.sh /home/vscode/start_http_server.sh
4653
RUN mkdir -p /run/user/1000 && chown vscode /run/user/1000
4754
ENV XDG_RUNTIME_DIR=/run/user/1000

start_http_server.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ echo "************************************************************"
1515
echo ""
1616
echo ""
1717

18-
xpra start --start-child=$EXE --bind-tcp=0.0.0.0:$PORT --ssl-cert=/etc/xpra/ssl-cert.pem --exit-with-children --no-daemon > xpra_logfile.txt 2>&1
18+
# use xpra as window manager
19+
xpra start --start-child=$EXE --bind-tcp=0.0.0.0:$PORT --ssl-cert=/etc/xpra/ssl-cert.pem --exit-with-children --no-daemon > xpra_logfile.txt 2>&1
20+
# use emwm as window manager (buggy)
21+
#xpra desktop --start-child=emwm --bind-tcp=0.0.0.0:$PORT --ssl-cert=/etc/xpra/ssl-cert.pem --exit-with-children --no-daemon > xpra_logfile.txt 2>&1
22+
1923
wait $!
2024

2125
## open your web browser to http://localhost:$PORT

0 commit comments

Comments
 (0)