diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 02815be..c03c62b 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,6 +1,10 @@ FROM mcr.microsoft.com/devcontainers/dotnet:1-8.0-bookworm -RUN apt-get update && apt-get install -y p7zip-full -RUN mkdir -p /workspace/gaseous-server/wwwroot/emulators/EmulatorJS -RUN wget https://cdn.emulatorjs.org/releases/4.0.11.7z -RUN 7z x -y -o/workspace/gaseous-server/wwwroot/emulators/EmulatorJS 4.0.11.7z \ No newline at end of file +# 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.1.1.7z +RUN 7z x -y -oout/wwwroot/emulators/EmulatorJS 4.1.1.7z \ No newline at end of file diff --git a/build/Dockerfile b/build/Dockerfile index db06c50..58959e9 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -14,19 +14,14 @@ 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 -# disabled for 1.7.4 as the next version EmulatorJS is not yet available -# # update apt-get -# RUN apt-get update +# 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 -RUN wget --recursive --no-parent https://cdn.emulatorjs.org/latest/ +# download and unzip EmulatorJS from CDN +RUN apt-get install -y p7zip-full RUN mkdir -p out/wwwroot/emulators/EmulatorJS -RUN cp -fr cdn.emulatorjs.org/latest/* out/wwwroot/emulators/EmulatorJS -RUN rm -Rf cdn.emulatorjs.org +RUN wget https://cdn.emulatorjs.org/releases/4.1.1.7z +RUN 7z x -y -oout/wwwroot/emulators/EmulatorJS 4.1.1.7z # 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 ac68b24..eca3696 100644 --- a/build/Dockerfile-EmbeddedDB +++ b/build/Dockerfile-EmbeddedDB @@ -14,15 +14,14 @@ 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 -# disabled for 1.7.4 as the next version EmulatorJS is not yet available -# # update apt-get -# RUN apt-get update +# 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.1.1.7z +RUN 7z x -y -oout/wwwroot/emulators/EmulatorJS 4.1.1.7z RUN wget --recursive --no-parent https://cdn.emulatorjs.org/latest/ RUN mkdir -p out/wwwroot/emulators/EmulatorJS