diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 9dcf0bd5..8c67e00b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -10,6 +10,8 @@ env: jobs: publish-emscripten: name: Publish web port + env: + IMAGE_NAME: ${{ github.repository }}-emscripten runs-on: ubuntu-latest permissions: contents: read diff --git a/docker/emscripten/Dockerfile b/docker/emscripten/Dockerfile index 7c72a5a9..d15d2406 100644 --- a/docker/emscripten/Dockerfile +++ b/docker/emscripten/Dockerfile @@ -27,12 +27,11 @@ RUN emcmake cmake -S . -B build -DISLE_BUILD_CONFIG=OFF -DISLE_DEBUG=OFF -DCMAKE 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 && \ - cp -r /tmp/isle.pizza/* /src/build/ && \ - rm -rf /tmp/isle.pizza; + git clone --depth 1 https://github.com/isledecomp/isle.pizza /tmp/isle.pizza; FROM nginx:alpine COPY docker/emscripten/nginx.conf /etc/nginx/nginx.conf -COPY --from=builder /src/build /usr/share/nginx/html +COPY --from=builder /tmp/isle.pizza /usr/share/nginx/html +COPY --from=builder /src/build/isle.* /usr/share/nginx/html EXPOSE 6931