fixed up for off-grid use

This commit is contained in:
2024-06-07 21:53:52 -07:00
parent 7d78420ece
commit ec817b0640
9 changed files with 50 additions and 6 deletions

View File

@@ -2,8 +2,8 @@ FROM alpine
ENV VENUE "${VENUE}" ENV VENUE "${VENUE}"
RUN apk update && apk add --no-cache git php php-pdo_sqlite patch && sed -i "s/;extension=pdo_sqlite/extension=pdo_sqlite/" /etc/php83/php.ini && git clone https://github.com/OpenKJ/StandaloneRequestServer && cd StandaloneRequestServer && mkdir /db && sed -i "s/\/var\/www\/html\/okjweb/\/db/" settings.inc && apk del git RUN apk update && apk add --no-cache git php php-pdo_sqlite patch && sed -i "s/;extension=pdo_sqlite/extension=pdo_sqlite/" /etc/php83/php.ini && git clone https://github.com/OpenKJ/StandaloneRequestServer && cd StandaloneRequestServer && mkdir /db && sed -i "s/\/var\/www\/html\/okjweb/\/db/" settings.inc && apk del git
WORKDIR /StandaloneRequestServer WORKDIR /StandaloneRequestServer
COPY customization.patch /StandaloneRequestServer/customization.patch COPY *.patch *-font.* /StandaloneRequestServer/
COPY --chmod=0755 entrypoint.sh /entrypoint.sh COPY --chmod=0755 entrypoint.sh /entrypoint.sh
RUN patch -p1 <customization.patch && rm customization.patch && apk del patch RUN patch -p1 <customization.patch && rm customization.patch && patch -p1 <local.patch && rm local.patch && apk del patch
VOLUME /db VOLUME /db
CMD /entrypoint.sh CMD /entrypoint.sh

View File

@@ -2,7 +2,9 @@ OpenKJ Songbook for Docker
========================== ==========================
This is a containerized [standalone songbook server](https://github.com/OpenKJ/StandaloneRequestServer/) for This is a containerized [standalone songbook server](https://github.com/OpenKJ/StandaloneRequestServer/) for
[OpenKJ](https://github.com/OpenKJ/OpenKJ). [OpenKJ](https://github.com/OpenKJ/OpenKJ). The fonts and CSS files it
pulled from Google servers have been included, so the server can run 100%
off-grid.
Get the server up and running: Get the server up and running:
@@ -24,6 +26,7 @@ Make sure ```Accept Requests``` is checked
Make sure ```Automatically show this dialog on new requests``` is checked Make sure ```Automatically show this dialog on new requests``` is checked
Click ```Update Remote DB``` Click ```Update Remote DB```
TODO: hotspot configuration For off-grid use, linux-wifi-hotspot works pretty well...set up an open
TODO: changes to the server code to run offline (no links to external access point and scribble the IP address on a whiteboard so people can use
sources) their phones to search songs and make requests, or point a 2nd computer at
it for the purpose.

6
audiowide-font.css Normal file
View File

@@ -0,0 +1,6 @@
@font-face {
font-family: 'Audiowide';
font-style: normal;
font-weight: 400;
src: url(audiowide-font.ttf) format('truetype');
}

BIN
audiowide-font.ttf Normal file
View File

Binary file not shown.

23
local.patch Normal file
View File

@@ -0,0 +1,23 @@
--- a/global.inc 2024-06-07 21:16:00.000000000 -0700
+++ a/global.inc 2024-06-07 21:22:21.878037269 -0700
@@ -18,8 +18,8 @@
global $venueName;
global $screensize;
echo "<html><head>
- <link href='https://fonts.googleapis.com/css?family=Audiowide' rel='stylesheet'>
- <link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet'>
+ <link href='audiowide-font.css' rel='stylesheet'>
+ <link href='roboto-font.css' rel='stylesheet'>
<title>$venueName Karaoke Songbook</title>
<link rel=stylesheet type=\"text/css\" href=venuestyle.css />
<script type=\"text/javascript\">
--- a/venuestyle.css 2024-06-07 21:16:00.000000000 -0700
+++ a/venuestyle.css 2024-06-07 21:22:21.756037711 -0700
@@ -1,5 +1,5 @@
-@import url(http://fonts.googleapis.com/css?family=Scada);
-@import url(http://fonts.googleapis.com/css?family=Audiowide);
+@import url(scada-font.css);
+@import url(audiowide-font.css);
body
{

6
roboto-font.css Normal file
View File

@@ -0,0 +1,6 @@
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url(roboto-font.ttf) format('truetype');
}

BIN
roboto-font.ttf Normal file
View File

Binary file not shown.

6
scada-font.css Normal file
View File

@@ -0,0 +1,6 @@
@font-face {
font-family: 'Scada';
font-style: normal;
font-weight: 400;
src: url(scada-font.ttf) format('truetype');
}

BIN
scada-font.ttf Normal file
View File

Binary file not shown.