From b463bb60649d830fd02e9dfd5f3f8acda6568290 Mon Sep 17 00:00:00 2001 From: Michael Green <84688932+michael-j-green@users.noreply.github.com> Date: Sat, 29 Jun 2024 22:49:34 +1000 Subject: [PATCH] EJS Amiga fix --- build/Dockerfile | 18 +++++++++++------- build/Dockerfile-EmbeddedDB | 18 +++++++++++------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index da95263..014e087 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -14,14 +14,18 @@ RUN dotnet restore "gaseous-server/gaseous-server.csproj" -a $TARGETARCH # Build and publish a release RUN dotnet publish "gaseous-server/gaseous-server.csproj" --use-current-runtime --self-contained true -c Release -o out -a $TARGETARCH -# update apt-get -RUN apt-get update +# disabled for 1.7.4 as the next version EmulatorJS is not yet available +# # update apt-get +# RUN apt-get update -# download and unzip EmulatorJS from CDN -RUN apt-get install -y p7zip-full -RUN mkdir -p out/wwwroot/emulators/EmulatorJS -RUN wget https://cdn.emulatorjs.org/releases/4.0.12.7z -RUN 7z x -y -oout/wwwroot/emulators/EmulatorJS 4.0.12.7z +# # download and unzip EmulatorJS from CDN +# RUN apt-get install -y p7zip-full +# RUN mkdir -p out/wwwroot/emulators/EmulatorJS +# RUN wget https://cdn.emulatorjs.org/releases/4.0.12.7z +# RUN 7z x -y -oout/wwwroot/emulators/EmulatorJS 4.0.12.7z +RUN wget --recursive --no-parent https://cdn.emulatorjs.org/latest/ +RUN cp -fr cdn.emulatorjs.org/latest/* out/wwwroot/emulators/EmulatorJS +RUN rm -Rf cdn.emulatorjs.org # clean up apt-get RUN apt-get clean && rm -rf /var/lib/apt/lists diff --git a/build/Dockerfile-EmbeddedDB b/build/Dockerfile-EmbeddedDB index d6b5180..005f0bb 100644 --- a/build/Dockerfile-EmbeddedDB +++ b/build/Dockerfile-EmbeddedDB @@ -14,14 +14,18 @@ RUN dotnet restore "gaseous-server/gaseous-server.csproj" -a $TARGETARCH # Build and publish a release RUN dotnet publish "gaseous-server/gaseous-server.csproj" --use-current-runtime --self-contained true -c Release -o out -a $TARGETARCH -# update apt-get -RUN apt-get update +# disabled for 1.7.4 as the next version EmulatorJS is not yet available +# # update apt-get +# RUN apt-get update -# download and unzip EmulatorJS from CDN -RUN apt-get install -y p7zip-full -RUN mkdir -p out/wwwroot/emulators/EmulatorJS -RUN wget https://cdn.emulatorjs.org/releases/4.0.12.7z -RUN 7z x -y -oout/wwwroot/emulators/EmulatorJS 4.0.12.7z +# # download and unzip EmulatorJS from CDN +# RUN apt-get install -y p7zip-full +# RUN mkdir -p out/wwwroot/emulators/EmulatorJS +# RUN wget https://cdn.emulatorjs.org/releases/4.0.12.7z +# RUN 7z x -y -oout/wwwroot/emulators/EmulatorJS 4.0.12.7z +RUN wget --recursive --no-parent https://cdn.emulatorjs.org/latest/ +RUN cp -fr cdn.emulatorjs.org/latest/* out/wwwroot/emulators/EmulatorJS +RUN rm -Rf cdn.emulatorjs.org # Build runtime image FROM mcr.microsoft.com/dotnet/aspnet:8.0