From 89d47c048451e21e06a7fe14119e1e587803c9d9 Mon Sep 17 00:00:00 2001 From: FilAgain2763 Date: Fri, 19 Sep 2025 20:16:51 +0100 Subject: [PATCH] Emscripteno. --- docker/emscripten/Dockerfile | 45 ---------- docker/emscripten/nginx.conf | 82 ------------------- docker/emscripten/ssl_example/Caddyfile | 3 - .../emscripten/ssl_example/docker-compose.yml | 18 ---- 4 files changed, 148 deletions(-) delete mode 100644 docker/emscripten/Dockerfile delete mode 100644 docker/emscripten/nginx.conf delete mode 100644 docker/emscripten/ssl_example/Caddyfile delete mode 100644 docker/emscripten/ssl_example/docker-compose.yml diff --git a/docker/emscripten/Dockerfile b/docker/emscripten/Dockerfile deleted file mode 100644 index 40c17cce..00000000 --- a/docker/emscripten/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM emscripten/emsdk:4.0.10 AS builder - -ARG CMAKE_VERSION=3.29.3 - -WORKDIR /src - -USER root - -RUN apt-get update && apt-get install -y git wget && rm -rf /var/lib/apt/lists/* -RUN wget https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.sh -O /tmp/cmake.sh && \ - chmod +x /tmp/cmake.sh && \ - /tmp/cmake.sh --skip-license --prefix=/usr/local && \ - rm /tmp/cmake.sh - -RUN chown -R emscripten:emscripten /src - -USER emscripten - -COPY ISLE/emscripten/emscripten.patch /tmp/ -RUN cd /emsdk/upstream/emscripten && \ - git apply --check /tmp/emscripten.patch && \ - git apply /tmp/emscripten.patch - -COPY --chown=emscripten:emscripten 3rdparty/ ./3rdparty/ -COPY --chown=emscripten:emscripten LEGO1/ ./LEGO1/ -COPY --chown=emscripten:emscripten ISLE/ ./ISLE/ -COPY --chown=emscripten:emscripten miniwin/ ./miniwin/ -COPY --chown=emscripten:emscripten util/ ./util/ -COPY --chown=emscripten:emscripten CMake/ ./CMake/ -COPY --chown=emscripten:emscripten packaging/ ./packaging/ -COPY --chown=emscripten:emscripten extensions/ ./extensions/ -COPY --chown=emscripten:emscripten CMakeLists.txt . - -RUN emcmake cmake -S . -B build -DISLE_BUILD_CONFIG=OFF -DISLE_DEBUG=OFF -DCMAKE_BUILD_TYPE=Release -DISLE_EMSCRIPTEN_HOST=/assets && \ - emmake cmake --build build -j 32 - -RUN echo "Fetching isle.pizza frontend..."; \ - git clone --depth 1 https://github.com/isledecomp/isle.pizza /tmp/isle.pizza; - -FROM openresty/openresty:alpine - -COPY docker/emscripten/nginx.conf /usr/local/openresty/nginx/conf/nginx.conf -COPY --from=builder /tmp/isle.pizza /usr/local/openresty/nginx/html -COPY --from=builder /src/build/isle.* /usr/local/openresty/nginx/html -EXPOSE 6931 diff --git a/docker/emscripten/nginx.conf b/docker/emscripten/nginx.conf deleted file mode 100644 index cbd53d25..00000000 --- a/docker/emscripten/nginx.conf +++ /dev/null @@ -1,82 +0,0 @@ -events { - worker_connections 1024; -} - -http { - init_by_lua_block { - function find_entry_in_dir(parent_dir, name_to_find) - local safe_parent_dir = string.gsub(parent_dir, "'", "'\\''") - local lower_name_to_find = string.lower(name_to_find) - local pipe = io.popen("ls -A '" .. safe_parent_dir .. "' 2>/dev/null") - if not pipe then return nil end - - for entry in pipe:lines() do - if string.lower(entry) == lower_name_to_find then - pipe:close() - return entry - end - end - pipe:close() - return nil - end - - function find_recursive_path(path_to_check) - local current_resolved_path = "/" - - for component in string.gmatch(path_to_check, "([^/]+)") do - local found_entry = find_entry_in_dir(current_resolved_path, component) - if not found_entry then - return nil - end - - if current_resolved_path == "/" then - current_resolved_path = current_resolved_path .. found_entry - else - current_resolved_path = current_resolved_path .. "/" .. found_entry - end - end - return current_resolved_path - end - } - - include /usr/local/openresty/nginx/conf/mime.types; - - server { - listen 6931; - server_name localhost; - - add_header 'Cross-Origin-Embedder-Policy' 'require-corp'; - add_header 'Cross-Origin-Opener-Policy' 'same-origin'; - add_header 'Cross-Origin-Resource-Policy' 'cross-origin'; - - location / { - root /usr/local/openresty/nginx/html; - index index.html isle.html; - try_files $uri $uri/ =404; - } - - location /assets/ { - content_by_lua_block { - local request_uri = ngx.var.uri - local resolved_path = find_recursive_path(request_uri) - - if not resolved_path then - local fallback_uri = ngx.re.sub(request_uri, [[^/assets/]], "/assets/DATA/disk/", "i") - resolved_path = find_recursive_path(fallback_uri) - end - - if resolved_path then - ngx.exec("/internal" .. resolved_path) - else - ngx.exit(ngx.HTTP_NOT_FOUND) - end - } - } - - location /internal/assets/ { - internal; - root /; - rewrite ^/internal(.*)$ $1 break; - } - } -} diff --git a/docker/emscripten/ssl_example/Caddyfile b/docker/emscripten/ssl_example/Caddyfile deleted file mode 100644 index a5fc9766..00000000 --- a/docker/emscripten/ssl_example/Caddyfile +++ /dev/null @@ -1,3 +0,0 @@ -https://localhost:6932 { - reverse_proxy app:6931 -} diff --git a/docker/emscripten/ssl_example/docker-compose.yml b/docker/emscripten/ssl_example/docker-compose.yml deleted file mode 100644 index 84e88ea9..00000000 --- a/docker/emscripten/ssl_example/docker-compose.yml +++ /dev/null @@ -1,18 +0,0 @@ -services: - app: - image: ghcr.io/isledecomp/isle-portable-emscripten:master - ports: - - "6931:6931" - volumes: - - ${ASSETS_PATH}:/assets - - caddy: - image: caddy:latest - ports: - - "6932:6932" - volumes: - - ./Caddyfile:/etc/caddy/Caddyfile - - caddy_data:/data - -volumes: - caddy_data: \ No newline at end of file