From c8fd3c309b4a3b117ac0d6f9476eaa57226076b8 Mon Sep 17 00:00:00 2001 From: Neil McPhail Date: Mon, 29 Sep 2025 13:58:40 +0100 Subject: [PATCH] Add all of z88dk to ensure everything works --- .devcontainer/Dockerfile | 4 +--- .devcontainer/devcontainer.json | 2 +- README.md | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 3e63ff9..2776453 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -95,9 +95,7 @@ COPY --from=build /zxbasic/tools /opt/zxbasic/tools COPY --from=build /inpaws/inpaws /bin/inpaws COPY --from=build /usr/local/bin/ /usr/local/bin/ COPY --from=build /usr/local/lib/python3.12/dist-packages/skoolkit/ /usr/local/lib/python3.12/dist-packages/skoolkit/ -COPY --from=z88dk /opt/z88dk/bin /opt/z88dk/bin -COPY --from=z88dk /opt/z88dk/lib /opt/z88dk/lib -COPY --from=z88dk /opt/z88dk/include /opt/z88dk/include +COPY --from=z88dk /opt/z88dk/ /opt/z88dk/ ENV PATH="${PATH}:/opt/z88dk/bin:/opt/zxbasic:/opt/zxbasic/tools" ENV ZCCCFG="/opt/z88dk/lib/config" USER ubuntu diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 4ded02a..5b482a4 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "name": "ZX Spectrum dev tools", //"build": { "dockerfile": "Dockerfile" }, // The Dockerfile takes an age to build due to z88dk, so pull from prebuilt: - "image": "boarstone.mcphail.uk/mcphail/speccydev:v1.0", + "image": "boarstone.mcphail.uk/mcphail/speccydev:v1.1", "remoteUser": "ubuntu", "runArgs": [ "--network=host" diff --git a/README.md b/README.md index 7486e87..697660c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Development tools for the ZX Spectrum v1.0 +# Development tools for the ZX Spectrum v1.1 The Dockerfile is the basis of the devcontainer and can be changed to add or remove tools. It will take a long time to build locally, so by default the devcontainer will pull a prebuilt version. Edit `.devcontainer/devcontainer.json` if you would rather build your own.