Commit 341030d7 authored by max's avatar max

maximize popup option, specify baseimage version

parent 483afb28
FROM jlesage/baseimage-gui:debian-9
FROM jlesage/baseimage-gui:debian-9-v3.5.2
ARG jriver_tag
ARG jriver_release
......@@ -31,10 +31,14 @@ ENV KEEP_APP_RUNNING=1 \
DISPLAY_WIDTH=1280 \
DISPLAY_HEIGHT=768 \
APP_NAME="JRiver MediaCenter ${jriver_release}" \
ENABLE_ASCII_ART=1 \
MAXIMIZE_POPUPS=0 \
S6_KILL_GRACETIME=8000
# Modify startapp.sh with jriver release version
RUN sed-patch s/%%mediacenter%%/mediacenter${jriver_release}/g \
/startapp.sh
# Modify startapp.sh and rc.xml with JRiver version
RUN sed-patch s/%%MC_VERSION%%/${jriver_release}/g \
/startapp.sh && \
sed-patch s/%%MC_VERSION%%/${jriver_release}/g \
/etc/xdg/openbox/rc.xml
EXPOSE 5800 5900 52100 52101 52199 1900/udp
\ No newline at end of file
......@@ -191,6 +191,13 @@ ports=5800,52199,52100,52101,5900/tcp|1900/udp
# Environment Variables
Specific to this image
| Variable | Description | Default |
|----------------|----------------------------------------------|---------|
| ENABLE_ASCII_ART | When set to `1` some ASCII art is printed to the console when JRiver starts. | `1` |
| MAXIMIZE_POPUPS | When set to `1` maximizes JRiver popup Windows | `0` |
Those are inherited from the base image [jlesage/baseimage-gui](https://github.com/jlesage/docker-baseimage-gui). Some have their default values changed.
| Variable | Description | Default |
......@@ -216,7 +223,10 @@ Those are inherited from the base image [jlesage/baseimage-gui](https://github.c
### Version 2
- xpropspy now uses sh instead of bash (microoptimization sh is faster, but can do less)
- ascii art on startup
- ascii art on startup and environment variable ENABLE_ASCII_ART (1 by default)
- specifying debian-9-v3.5.2 instead of latest, witch is currently equivalent (to avoid breaking the image on automated builds)
- removed portion for main jriver window from rc.xml as no longer needed (also seems to have fixed some ui gliches in the integrated webgui)
- added option MAXIMIZE_POPUPS to maximize every window that has the name "JRiver Popup Class" (0 by default)
### Version 1
- added image version
......
#!/usr/bin/with-contenv sh
if [ "$MAXIMIZE_POPUPS" = "1" ]; then
sed -i '/<\/applications>/{
r /templates/max-popups.xml
a \</applications>
d
}' /etc/xdg/openbox/rc.xml
fi;
\ No newline at end of file
#!/bin/sh
#!/usr/bin/with-contenv sh
while read line; do
search=$(echo "$line" | grep "_NET_ACTIVE_WINDOW(WINDOW): window id # ")
......
......@@ -373,11 +373,11 @@
</menu>
<applications>
<application type="normal" title="JRiver Media Center 25">
<!--<application type="normal" title="JRiver Media Center %%MC_VERSION%%">
<decor>no</decor>
<maximized>true</maximized>
<layer>below</layer>
</application>
</application>-->
</applications>
</openbox_config>
\ No newline at end of file
#!/bin/sh
export HOME=/config
if [ "$ENABLE_ASCII_ART" = "1" ]; then
echo '--------------------------------------------------'
cat << "EOF"
___ _ _
......@@ -15,4 +17,6 @@ echo 'Source: https://gitlab.shio.at/max/jrivermc-docker'
echo 'Dockerhub: https://hub.docker.com/u/shiomax'
echo ''
echo '--------------------------------------------------'
exec env HOME=/config %%mediacenter%% /mediaserver
\ No newline at end of file
fi;
exec env HOME=/config mediacenter%%MC_VERSION%% /mediaserver
\ No newline at end of file
<application type="normal" name="JRiver Popup Class">
<decor>no</decor>
<maximized>true</maximized>
</application>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment