From c38171a4e44f4eb0dc6014b507d063b5ee8c8e86 Mon Sep 17 00:00:00 2001 From: Neil McPhail Date: Fri, 8 May 2026 10:04:28 +0100 Subject: [PATCH] Switch container hosting to Docker Hub --- .devcontainer/Dockerfile | 4 ++-- .devcontainer/devcontainer.json | 2 +- .devcontainer/z88dk/Dockerfile | 2 +- README.md | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 3f87418..065e0d3 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 # My current workflow is to build this on an M1 MacBook for both amd64 and arm64 using: -# docker buildx build --platform linux/arm64/v8,linux/amd64 -t boarstone.mcphail.uk/mcphail/speccydev:tagname . +# docker buildx build --platform linux/arm64/v8,linux/amd64 -t njmcphail/speccydev:tagname . FROM ubuntu:24.04 AS build RUN apt-get update \ @@ -84,7 +84,7 @@ COPY --from=build /opt/pasta80 /opt/pasta80 # is in a subdirectory of this one. If you're building the container yourself you may # want to alter the next line to your own tagged build of z88dk but you're welcome to # use mine. -COPY --from=boarstone.mcphail.uk/mcphail/z88dk:v2.4 /opt/z88dk/ /opt/z88dk/ +COPY --from=njmcphail/z88dk:v2.4 /opt/z88dk/ /opt/z88dk/ ENV PATH="${PATH}:/opt/z88dk/bin:/opt/zxbasic:/opt/zxbasic/tools:/opt/pasta80" ENV ZCCCFG="/opt/z88dk/lib/config" USER ubuntu diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 140ff03..e557306 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:v8.0", + "image": "njmcphail/speccydev:v8.0", "remoteUser": "ubuntu", "runArgs": [ "--network=host" diff --git a/.devcontainer/z88dk/Dockerfile b/.devcontainer/z88dk/Dockerfile index 358201d..8e7db8c 100644 --- a/.devcontainer/z88dk/Dockerfile +++ b/.devcontainer/z88dk/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 # Similar to the speccydev container, I'm building this with: -# docker buildx build --platform linux/arm64/v8,linux/amd64 -t boarstone.mcphail.uk/mcphail/z88dk:tagname . +# docker buildx build --platform linux/arm64/v8,linux/amd64 -t njmcphail/z88dk:tagname . FROM ubuntu:24.04 AS build RUN apt-get update \ diff --git a/README.md b/README.md index 7353f8e..ac9d01e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Development tools for the ZX Spectrum v8.0 +# Development tools for the ZX Spectrum v8.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. @@ -79,9 +79,9 @@ Thanks to the many authors of these wonderful tools and extensions; to think wha No breaking changes, but this version brings full support for Apple silicon which was not present in previous releases. -## New additions from v7.0 +## New additions from v8.0 -Native arm64 build for Apple devices. +The prebuilt container is now hosted on Docker Hub, as the Gitea hosting platform was having reliability issues. The contents of the 8.1 container are unchanged from 8.0 so there is no need to update if you have downloaded this already. ## Install