From 46829487d666f528218e146b1bb9dd1e351d7f65 Mon Sep 17 00:00:00 2001 From: Adrian Priestley <47989725+a-priestley@users.noreply.github.com> Date: Sat, 26 Jul 2025 12:18:39 -0230 Subject: [PATCH] fix(docker): Correct copy command to use recursive flag for EnemizerCLI (#5211) * fix(docker): Correct copy command to use recursive flag for EnemizerCLI - Changed 'cp' to 'cp -r' to properly copy EnemizerCLI directory * docs(deployment): Update container deployment documentation - Specify minimum versions for Docker and Podman - Add requirement for Docker Buildx plugin --- Dockerfile | 4 +++- docs/deploy using containers.md | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c6d22a4f..46393aab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -86,7 +86,7 @@ COPY --from=enemizer /release/EnemizerCLI /tmp/EnemizerCLI # No release for arm architecture. Skip. RUN if [ "$TARGETARCH" = "amd64" ]; then \ - cp /tmp/EnemizerCLI EnemizerCLI; \ + cp -r /tmp/EnemizerCLI EnemizerCLI; \ fi; \ rm -rf /tmp/EnemizerCLI @@ -94,5 +94,7 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then \ HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \ CMD curl -f http://localhost:${PORT:-80} || exit 1 +# Ensure no runtime ModuleUpdate. ENV SKIP_REQUIREMENTS_UPDATE=true + ENTRYPOINT [ "python", "WebHost.py" ] diff --git a/docs/deploy using containers.md b/docs/deploy using containers.md index bb779001..6db38d44 100644 --- a/docs/deploy using containers.md +++ b/docs/deploy using containers.md @@ -9,9 +9,10 @@ Follow these steps to build and deploy a containerized instance of the web host What you'll need: * A container runtime engine such as: - * [Docker](https://www.docker.com/) - * [Podman](https://podman.io/) + * [Docker](https://www.docker.com/) (Version 23.0 or later) + * [Podman](https://podman.io/) (version 4.0 or later) * For running with rootless podman, you need to ensure all ports used are usable rootless, by default ports less than 1024 are root only. See [the official tutorial](https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md) for details. + * The Docker Buildx plugin (for Docker), as the Dockerfile uses `$TARGETARCH` for architecture detection. Follow [Docker's guide](https://docs.docker.com/build/buildx/install/). Verify with `docker buildx version`. Starting from the root repository directory, the standalone Archipelago image can be built and run with the command: `docker build -t archipelago .`