From 0e70047bdc62408788ddbb45c4c67af13d1e685e Mon Sep 17 00:00:00 2001 From: Doro Wu Date: Fri, 24 Apr 2020 15:00:01 +0800 Subject: [PATCH] fix: novnc language (#174) --- Dockerfile.amd64 | 1 + Dockerfile.arm64 | 1 + Dockerfile.armhf | 4 ++-- Dockerfile.j2 | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index 34f8eae..8f250cf 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -99,6 +99,7 @@ COPY web /src/web RUN cd /src/web \ && yarn \ && yarn build +RUN sed -i 's#app/locale/#novnc/app/locale/#' /src/web/dist/static/novnc/app/ui.js diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 2330d3e..d9fb545 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -99,6 +99,7 @@ COPY web /src/web RUN cd /src/web \ && yarn \ && npm run build +RUN sed -i 's#app/locale/#novnc/app/locale/#' /src/web/dist/static/novnc/app/ui.js RUN cd /src/web/dist/static/novnc && patch -p0 < /src/web/novnc-armhf-1.patch diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 7913ab4..561bb77 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -98,8 +98,8 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ COPY web /src/web RUN cd /src/web \ && yarn \ - && npm run build - + && yarn run build +RUN sed -i 's#app/locale/#novnc/app/locale/#' /src/web/dist/static/novnc/app/ui.js RUN cd /src/web/dist/static/novnc && patch -p0 < /src/web/novnc-armhf-1.patch diff --git a/Dockerfile.j2 b/Dockerfile.j2 index fde152f..5c9039a 100644 --- a/Dockerfile.j2 +++ b/Dockerfile.j2 @@ -126,6 +126,7 @@ COPY web /src/web RUN cd /src/web \ && yarn \ && yarn build +RUN sed -i 's#app/locale/#novnc/app/locale/#' /src/web/dist/static/novnc/app/ui.js {%if arch == "armhf"%} RUN cd /src/web/dist/static/novnc && patch -p0 < /src/web/novnc-armhf-1.patch