diff --git a/Dockerfile b/Dockerfile index 7ee5edb..d0edc1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,10 @@ RUN apk --no-cache add --virtual build-dependencies \ && mkdir -p build \ && cd build \ - # Need glibc for locale support + # Need glibc for locale support, not that any UTF8 locales work :/ + # This PR seems to be the most relevant: https://github.com/andyshinn/alpine-pkg-glibc/issues/13 + # Note that we're currently having to use this hack in hiptext because of alpine's poor locale support: + # https://github.com/tombh/hiptext/commit/bc502af5f6e3b622a9b53d1ffb9a40e74d968ae3 && wget -q -O /etc/apk/keys/andyshinn.rsa.pub https://raw.githubusercontent.com/andyshinn/alpine-pkg-glibc/master/andyshinn.rsa.pub \ && wget https://github.com/andyshinn/alpine-pkg-glibc/releases/download/2.23-r1/glibc-2.23-r1.apk \ && apk --no-cache add glibc-2.23-r1.apk \ @@ -25,7 +28,7 @@ RUN apk --no-cache add --virtual build-dependencies \ # Watch: https://github.com/jart/hiptext/pull/27 && git clone https://github.com/tombh/hiptext \ && cd hiptext \ - && git checkout ffmpeg-updates \ + && git checkout ffmpeg-updates-and-unicode-hack \ && make \ # Alpine's version of `install` doesn't support the `--mode=` format && install -m 0755 hiptext /usr/local/bin \ diff --git a/run.sh b/run.sh index ecbc7a7..7160fd7 100755 --- a/run.sh +++ b/run.sh @@ -59,6 +59,7 @@ sleep 1 # TODO: support dynamic sizing hiptext \ -font /usr/share/fonts/ttf-dejavu/DejaVuSansMono.ttf \ + --xterm256unicode \ -bgprint=true \ $UDP_URI \ 2> ./logs/hiptext.log