4 Commits

Author SHA1 Message Date
mcphail 8b5c9f3682 Update sjasmplus 2026-06-12 10:20:17 +01:00
mcphail c38171a4e4 Switch container hosting to Docker Hub 2026-05-08 10:04:28 +01:00
mcphail a9eb75ca3e May wish to add debugger config 2026-05-03 19:55:31 +01:00
mcphail 6431ce9832 One liner to add devcontainer to existing projects 2026-05-03 19:50:43 +01:00
4 changed files with 17 additions and 9 deletions
+3 -3
View File
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
# My current workflow is to build this on an M1 MacBook for both amd64 and arm64 using: # 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 FROM ubuntu:24.04 AS build
RUN apt-get update \ RUN apt-get update \
@@ -16,7 +16,7 @@ RUN apt-get update \
unzip \ unzip \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
ADD https://github.com/z00m128/sjasmplus.git#v1.23.0 /sjasmplus ADD https://github.com/z00m128/sjasmplus.git#v1.23.1 /sjasmplus
RUN cd /sjasmplus && make -j8 && make install RUN cd /sjasmplus && make -j8 && make install
ADD https://boarstone.mcphail.uk/mcphail/spectrum_remload.git /ttttt ADD https://boarstone.mcphail.uk/mcphail/spectrum_remload.git /ttttt
RUN cd /ttttt && make ttttt RUN cd /ttttt && make ttttt
@@ -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 # 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 # want to alter the next line to your own tagged build of z88dk but you're welcome to
# use mine. # 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 PATH="${PATH}:/opt/z88dk/bin:/opt/zxbasic:/opt/zxbasic/tools:/opt/pasta80"
ENV ZCCCFG="/opt/z88dk/lib/config" ENV ZCCCFG="/opt/z88dk/lib/config"
USER ubuntu USER ubuntu
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "ZX Spectrum dev tools", "name": "ZX Spectrum dev tools",
//"build": { "dockerfile": "Dockerfile" }, //"build": { "dockerfile": "Dockerfile" },
// The Dockerfile takes an age to build due to z88dk, so pull from prebuilt: // 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.2",
"remoteUser": "ubuntu", "remoteUser": "ubuntu",
"runArgs": [ "runArgs": [
"--network=host" "--network=host"
+1 -1
View File
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
# Similar to the speccydev container, I'm building this with: # 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 FROM ubuntu:24.04 AS build
RUN apt-get update \ RUN apt-get update \
+12 -4
View File
@@ -1,10 +1,10 @@
# Development tools for the ZX Spectrum v8.0 # Development tools for the ZX Spectrum v8.2
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. 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.
The devcontainer contains: The devcontainer contains:
- pasmo version 0.5.3 (assembler) - pasmo version 0.5.3 (assembler)
- sjasmplus version 1.23.0 (assembler) - sjasmplus version 1.23.1 (assembler)
- z80asm version 1.8 (assembler) - z80asm version 1.8 (assembler)
- z80dasm version 1.1.6 (disassembler) - z80dasm version 1.1.6 (disassembler)
- zmakebas version 1.2b (creates BASIC programs) - zmakebas version 1.2b (creates BASIC programs)
@@ -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. 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.1
Native arm64 build for Apple devices. Minor version update for sjasmplus.
## Install ## Install
@@ -106,6 +106,14 @@ Open the bottom bar in vscode to expose the terminal or select "Terminal -> New
When you are ready to start your own project, run `make start_new_project` to wipe out the example code and start afresh. When you are ready to start your own project, run `make start_new_project` to wipe out the example code and start afresh.
## Add the devcontainer to your existing project
```bash
curl https://raw.githubusercontent.com/mcphail/speccydev/refs/heads/main/.devcontainer/devcontainer.json -o .devcontainer.json
```
You may wish to also add the `.vscode/` directory as well, to configure the debugger.
## Versions ## Versions
This `main` branch of this repository will always point to the latest numbered release of the devcontainer image. This image will contain specific, numbered releases of the various tools as documented above. If the devcontainer is updated with non-breaking changes, the minor version number will be incremented. This gives reassurance that, say, a v1.7 devcontainer will contain tools which can compile programs made with a v1.2 devcontainer without issue. This `main` branch of this repository will always point to the latest numbered release of the devcontainer image. This image will contain specific, numbered releases of the various tools as documented above. If the devcontainer is updated with non-breaking changes, the minor version number will be incremented. This gives reassurance that, say, a v1.7 devcontainer will contain tools which can compile programs made with a v1.2 devcontainer without issue.