4 Commits
Author SHA1 Message Date
mcphail 748c904729 Update base to Ubuntu 26.04 and minor version bump for Boriel BASIC with higher python dependency 2026-08-08 11:36:37 +01:00
mcphail 22a10706ca Update pasta80 2026-07-04 22:52:50 +00:00
mcphail ae84c32404 Finder can get lost 2026-07-04 22:52:30 +00:00
mcphail 8b5c9f3682 Update sjasmplus 2026-06-12 10:20:17 +01:00
4 changed files with 18 additions and 18 deletions
+7 -8
View File
@@ -3,7 +3,7 @@
# 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 njmcphail/speccydev:tagname . # docker buildx build --platform linux/arm64/v8,linux/amd64 -t njmcphail/speccydev:tagname .
FROM ubuntu:24.04 AS build FROM ubuntu:26.04 AS build
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
autoconf \ autoconf \
@@ -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
@@ -24,8 +24,7 @@ ADD https://github.com/einar-saukas/ZX0.git /zx0
RUN cd /zx0/src/ \ RUN cd /zx0/src/ \
&& gcc -O2 -o zx0 zx0.c optimize.c compress.c memory.c \ && gcc -O2 -o zx0 zx0.c optimize.c compress.c memory.c \
&& gcc -O2 -o dzx0 dzx0.c && gcc -O2 -o dzx0 dzx0.c
ADD https://www.boriel.com/files/zxb/zxbasic-1.18.7-linux64.tar.gz . ADD --unpack https://www.boriel.com/files/zxb/zxbasic-1.19.0-linux64.tar.gz .
RUN tar xf zxbasic*
ADD https://github.com/Mastodon-/inpaws.git /inpaws ADD https://github.com/Mastodon-/inpaws.git /inpaws
RUN cd /inpaws/ \ RUN cd /inpaws/ \
&& make -j8 && make -j8
@@ -39,17 +38,17 @@ RUN cd /hdfmonkey/ \
&& ./configure \ && ./configure \
&& make -j16 \ && make -j16 \
&& make install && make install
ADD https://github.com/pleumann/pasta80.git#v0.98 /opt/pasta80 ADD https://github.com/pleumann/pasta80.git#v0.99 /opt/pasta80
RUN cd /opt/pasta80 \ RUN cd /opt/pasta80 \
&& fpc pasta && fpc pasta
ADD --unpack https://www.seasip.info/ZX/taptools-1.1.3.tar.gz taptools/ ADD --unpack https://www.seasip.info/ZX/taptools-1.1.3.tar.gz taptools/
RUN cd taptools/taptools* \ RUN cd taptools/taptools* \
&& cp /usr/share/automake-1.16/config.guess . \ && cp /usr/share/automake-1.18/config.guess . \
&& ./configure \ && ./configure \
&& make -j8 \ && make -j8 \
&& make install && make install
FROM ubuntu:24.04 FROM ubuntu:26.04
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
ca-certificates \ ca-certificates \
@@ -76,7 +75,7 @@ COPY --from=build /zxbasic/src /opt/zxbasic/src
COPY --from=build /zxbasic/tools /opt/zxbasic/tools COPY --from=build /zxbasic/tools /opt/zxbasic/tools
COPY --from=build /inpaws/inpaws /bin/inpaws COPY --from=build /inpaws/inpaws /bin/inpaws
COPY --from=build /usr/local/bin/ /usr/local/bin/ 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=build /usr/local/lib/python3.14/dist-packages/skoolkit/ /usr/local/lib/python3.14/dist-packages/skoolkit/
COPY --from=build /opt/pasta80 /opt/pasta80 COPY --from=build /opt/pasta80 /opt/pasta80
# z88dk takes a long time to cross compile so I'm keeping this in a separate container # z88dk takes a long time to cross compile so I'm keeping this in a separate container
+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": "njmcphail/speccydev:v8.0", "image": "njmcphail/speccydev:v9.0",
"remoteUser": "ubuntu", "remoteUser": "ubuntu",
"runArgs": [ "runArgs": [
"--network=host" "--network=host"
+2 -1
View File
@@ -5,4 +5,5 @@
*.tzx *.tzx
*.block *.block
*.zx0 *.zx0
*.bin *.bin
.DS_Store
+8 -8
View File
@@ -1,10 +1,10 @@
# Development tools for the ZX Spectrum v8.1 # Development tools for the ZX Spectrum v9.0
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)
@@ -29,7 +29,7 @@ The devcontainer contains:
- tzxlist - tzxlist
- zx0 (binary compressor) - zx0 (binary compressor)
- dzx0 (binary decompressor) - dzx0 (binary decompressor)
- ZX BASIC (aka Boriel BASIC) version 1.18.7 - ZX BASIC (aka Boriel BASIC) version 1.19.0
- zxbc (BASIC compiler) - zxbc (BASIC compiler)
- zxbasm (assembler) - zxbasm (assembler)
- zxbpp (preprocessor) - zxbpp (preprocessor)
@@ -53,7 +53,7 @@ The devcontainer contains:
- bin2sna.py - bin2sna.py
- snapmod.py - snapmod.py
- sna2img.py - sna2img.py
- pasta80 version 0.98 (PASCAL compiler) - pasta80 version 0.99 (PASCAL compiler)
- hdfmonkey version 0.4 (for manipulating sdcard files for the Spectrum Next) - hdfmonkey version 0.4 (for manipulating sdcard files for the Spectrum Next)
- git (version control) - git (version control)
- make (build control) - make (build control)
@@ -75,13 +75,13 @@ Several useful VSCode extentsions will be installed, including a Z80 assembly la
Thanks to the many authors of these wonderful tools and extensions; to think what we could have made with these in 1985! Thanks to the many authors of these wonderful tools and extensions; to think what we could have made with these in 1985!
## Breaking changes from v7.x ## Breaking changes from v8.x
No breaking changes, but this version brings full support for Apple silicon which was not present in previous releases. The base has been updated from Ubuntu 24.04 to Ubuntu 26.04, largely to bring in python 3.14 which is required for the current release of Boriel BASIC. This may cause some issues, so please report bugs. z88dk is still being built on 24.04 but should be ABI compatible. Again, please report any bugs you find.
## New additions from v8.0 ## New additions from v8.3
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. Minor version update for Boriel BASIC.
## Install ## Install