From 6f5b52058c79fa64077eb9464d5b823fc404a45f Mon Sep 17 00:00:00 2001
From: Michael Green <84688932+michael-j-green@users.noreply.github.com>
Date: Fri, 25 Oct 2024 00:14:06 +1100
Subject: [PATCH] Updated to the latest version of EJS (see:
 https://github.com/EmulatorJS/EmulatorJS/releases/tag/v4.1.1)

---
 .devcontainer/Dockerfile    | 12 ++++++++----
 build/Dockerfile            | 12 +++---------
 build/Dockerfile-EmbeddedDB | 13 ++++++-------
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index c0d8d84..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.12.7z
-RUN 7z x -y -o/workspace/gaseous-server/wwwroot/emulators/EmulatorJS 4.0.12.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 800f17d..942113a 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -16,20 +16,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
 
-# Build Gaseous CLI
-# Restore as distinct layers
-RUN dotnet restore "gaseous-cli/gaseous-cli.csproj" -a $TARGETARCH
-# Build and publish a release
-RUN dotnet publish "gaseous-cli/gaseous-cli.csproj" --use-current-runtime --self-contained true -c Release -o out -a $TARGETARCH
-
 # update apt-get
 RUN apt-get update
 
-# # download and unzip EmulatorJS from CDN
+# 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 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 23a3c67..41b55db 100644
--- a/build/Dockerfile-EmbeddedDB
+++ b/build/Dockerfile-EmbeddedDB
@@ -16,18 +16,17 @@ 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
 
-# Build Gaseous CLI
-# Restore as distinct layers
-RUN dotnet restore "gaseous-cli/gaseous-cli.csproj" -a $TARGETARCH
-# Build and publish a release
-RUN dotnet publish "gaseous-cli/gaseous-cli.csproj" --use-current-runtime --self-contained true -c Release -o out -a $TARGETARCH
-
 # update apt-get
 RUN apt-get update
 
-# # download and unzip EmulatorJS from CDN
+# 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
 RUN wget https://cdn.emulatorjs.org/releases/4.0.12.7z
 RUN 7z x -y -oout/wwwroot/emulators/EmulatorJS 4.0.12.7z