Merge branch 'wizard-indocker' into 'master'

Wizard in docker

See merge request zlatinb/muwire!49
pull/53/head
Zlatin Balevsky 2020-09-27 15:56:12 +00:00
commit ac9a7ab3e0
2 changed files with 3 additions and 2 deletions

View File

@ -39,7 +39,7 @@ RUN \
# Generate and install favicons. # Generate and install favicons.
RUN \ RUN \
APP_ICON_URL=https://github.com/zlatinb/muwire/raw/master/gui/griffon-app/resources/MuWire-128x128.png && \ APP_ICON_URL=https://github.com/zlatinb/muwire/raw/master/gui/griffon-app/resources/MuWire-48x48.png && \
install_app_icon.sh "$APP_ICON_URL" install_app_icon.sh "$APP_ICON_URL"
# Add files. # Add files.
@ -47,7 +47,8 @@ COPY docker/rootfs/ /
# Set environment variables. # Set environment variables.
ENV APP_NAME="MuWire" \ ENV APP_NAME="MuWire" \
S6_KILL_GRACETIME=8000 S6_KILL_GRACETIME=8000 \
MU_WIRE_OPTS='"-Dwizard.defaults=/etc/muwire/MuWire.default.properties"'
# Define mountable directories. # Define mountable directories.
VOLUME ["$APP_HOME/.MuWire"] VOLUME ["$APP_HOME/.MuWire"]