Update to version 10.0 with major release of z88dk and minor release of skoolkit
This commit is contained in:
1 parent
80b0e83b1e
commit
e8bdc1c581
4 files changed
+11
-11
No files matched your search
@@ -28,7 +28,7 @@ ADD --unpack https://www.boriel.com/files/zxb/zxbasic-1.19.0-linux64.tar.gz .
|
||||
ADD https://github.com/Mastodon-/inpaws.git /inpaws
|
||||
RUN cd /inpaws/ \
|
||||
&& make -j8
|
||||
RUN python3 -m pip install --force-reinstall --break-system-packages skoolkit==10.1
|
||||
RUN python3 -m pip install --force-reinstall --break-system-packages skoolkit==10.2
|
||||
ADD https://github.com/gasman/hdfmonkey.git /hdfmonkey
|
||||
RUN cd /hdfmonkey/ \
|
||||
&& autoheader \
|
||||
@@ -83,7 +83,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=njmcphail/z88dk:v2.4 /opt/z88dk/ /opt/z88dk/
|
||||
COPY --from=njmcphail/z88dk:2.5 /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
|
||||
@@ -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": "njmcphail/speccydev:v9.2",
|
||||
"image": "njmcphail/speccydev:v10.0",
|
||||
"remoteUser": "ubuntu",
|
||||
"runArgs": [
|
||||
"--network=host"
|
||||
|
||||
@@ -41,7 +41,7 @@ RUN apt-get update \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
ENV Z88DK_PATH="/opt/z88dk"
|
||||
RUN cpanm -l $HOME/perl5 --no-wget local::lib Template::Plugin::YAML \
|
||||
&& git clone --depth 1 --branch v2.4 --recursive https://github.com/z88dk/z88dk.git ${Z88DK_PATH} \
|
||||
&& git clone --depth 1 --branch v2.5 --recursive https://github.com/z88dk/z88dk.git ${Z88DK_PATH} \
|
||||
&& cd ${Z88DK_PATH} \
|
||||
&& eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)" \
|
||||
&& chmod 777 build.sh \
|
||||
|
||||
Reference in new issue
Block a user