From 1fef9afa33c53cfc474c37d60ddfceb866586056 Mon Sep 17 00:00:00 2001 From: Rutger van Bergen Date: Thu, 29 Sep 2022 13:50:10 +0200 Subject: [PATCH 1/6] PrimeV: bump V version to weekly.2022.39 --- PrimeV/solution_1/Dockerfile | 2 +- PrimeV/solution_2/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PrimeV/solution_1/Dockerfile b/PrimeV/solution_1/Dockerfile index ebe8cd194..23cf604d2 100644 --- a/PrimeV/solution_1/Dockerfile +++ b/PrimeV/solution_1/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 AS build -ENV V_VER="0.3" +ENV V_VER="weekly.2022.39" RUN apk update && apk add --no-cache build-base bash git diff --git a/PrimeV/solution_2/Dockerfile b/PrimeV/solution_2/Dockerfile index ebe8cd194..23cf604d2 100644 --- a/PrimeV/solution_2/Dockerfile +++ b/PrimeV/solution_2/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 AS build -ENV V_VER="0.3" +ENV V_VER="weekly.2022.39" RUN apk update && apk add --no-cache build-base bash git From 72ad9c837708a59779cc22f03acb6f8a31e7b6c5 Mon Sep 17 00:00:00 2001 From: Rutger van Bergen Date: Sun, 31 Dec 2023 09:59:01 +0100 Subject: [PATCH 2/6] Update FreeBASIC --- PrimeBASIC/solution_1/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PrimeBASIC/solution_1/Dockerfile b/PrimeBASIC/solution_1/Dockerfile index b7319d6f8..775e8c106 100644 --- a/PrimeBASIC/solution_1/Dockerfile +++ b/PrimeBASIC/solution_1/Dockerfile @@ -1,11 +1,11 @@ -FROM primeimages/freebasic:1.07.3 AS build +FROM primeimages/freebasic:1.10.1 AS build WORKDIR /opt/app COPY *.bas *.sh ./ RUN find . -name 'prime_*.bas' -exec fbc {} -x {}.run \; -FROM ubuntu:18.04 +FROM ubuntu:22.04 WORKDIR /opt/app COPY --from=build /opt/app/*run* ./ From ac60efcd966c707305448ceade40b52d428c6a93 Mon Sep 17 00:00:00 2001 From: Rutger van Bergen Date: Sun, 31 Dec 2023 10:56:13 +0100 Subject: [PATCH 3/6] Update to Free Pascal 3.2.2 --- PrimePascal/solution_1/Dockerfile | 4 ++-- PrimePascal/solution_2/Dockerfile | 4 ++-- PrimePascal/solution_3/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/PrimePascal/solution_1/Dockerfile b/PrimePascal/solution_1/Dockerfile index eebc58588..7fbca1d76 100644 --- a/PrimePascal/solution_1/Dockerfile +++ b/PrimePascal/solution_1/Dockerfile @@ -1,11 +1,11 @@ -FROM primeimages/freepascal:3.2.0 AS build +FROM primeimages/freepascal:3.2.2 AS build WORKDIR /opt/app COPY *.pas . RUN fpc prime -O3 -FROM ubuntu:20.04 +FROM ubuntu:22.04 COPY --from=build /opt/app/prime /opt/app/ ENTRYPOINT [ "/opt/app/prime" ] \ No newline at end of file diff --git a/PrimePascal/solution_2/Dockerfile b/PrimePascal/solution_2/Dockerfile index 0af1b1aa7..cc0a179b2 100644 --- a/PrimePascal/solution_2/Dockerfile +++ b/PrimePascal/solution_2/Dockerfile @@ -1,11 +1,11 @@ -FROM primeimages/freepascal:3.2.0 AS build +FROM primeimages/freepascal:3.2.2 AS build WORKDIR /opt/app COPY *.pas . RUN fpc prime -FROM ubuntu:20.04 +FROM ubuntu:22.04 COPY --from=build /opt/app/prime /opt/app/ ENTRYPOINT [ "/opt/app/prime" ] \ No newline at end of file diff --git a/PrimePascal/solution_3/Dockerfile b/PrimePascal/solution_3/Dockerfile index 4f40ca52d..926972c63 100644 --- a/PrimePascal/solution_3/Dockerfile +++ b/PrimePascal/solution_3/Dockerfile @@ -1,11 +1,11 @@ -FROM primeimages/freepascal:3.2.0 AS build +FROM primeimages/freepascal:3.2.2 AS build WORKDIR /opt/app COPY *.pas run.sh ./ RUN fpc PrimePas -O3 -v0 -FROM ubuntu:20.04 +FROM ubuntu:22.04 WORKDIR /opt/app COPY --from=build /opt/app/PrimePas /opt/app/run.sh /opt/app/ From 4a0ef5811c253c176a07bd40ea33595902616c44 Mon Sep 17 00:00:00 2001 From: Rutger van Bergen Date: Sun, 31 Dec 2023 17:51:46 +0100 Subject: [PATCH 4/6] Update GDL to 1.0.4 --- PrimeIDL/solution_1/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PrimeIDL/solution_1/Dockerfile b/PrimeIDL/solution_1/Dockerfile index dd06d056a..1fbbea8ec 100644 --- a/PrimeIDL/solution_1/Dockerfile +++ b/PrimeIDL/solution_1/Dockerfile @@ -1,4 +1,4 @@ -FROM primeimages/gdl:1.0.0-rc3 +FROM primeimages/gdl:1.0.4 WORKDIR /opt/app From 2d62b1d9dedd59aa71513374a59ad624ab060425 Mon Sep 17 00:00:00 2001 From: Rutger van Bergen Date: Thu, 25 Jan 2024 08:50:51 +0100 Subject: [PATCH 5/6] Update 6502Assembly base image --- Prime6502Assembly/solution_1/Dockerfile | 11 ++++------- Prime6502Assembly/solution_1/parse.sh | 2 +- Prime6502Assembly/solution_1/run.sh | 2 +- Prime6502Assembly/solution_2/Dockerfile | 11 ++++------- Prime6502Assembly/solution_2/parse.sh | 2 +- Prime6502Assembly/solution_2/run.sh | 2 +- 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/Prime6502Assembly/solution_1/Dockerfile b/Prime6502Assembly/solution_1/Dockerfile index a48f6dc8a..c58bd8448 100644 --- a/Prime6502Assembly/solution_1/Dockerfile +++ b/Prime6502Assembly/solution_1/Dockerfile @@ -1,13 +1,10 @@ -FROM primeimages/vice:3.5 +# We're sticking to VICE 3.5 because in later versions the sequential output file doesn't get +# closed when the "CLOSE" ROM routine is called, making it impossible for c1451 to read it. +FROM primeimages/vice:3.5-ubuntu22.04 WORKDIR /opt -RUN wget https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \ - dpkg -i packages-microsoft-prod.deb && \ - rm packages-microsoft-prod.deb && \ - apt-get update && \ - apt-get install -y apt-transport-https && \ - apt-get update && \ +RUN apt-get update && \ apt-get install -y aspnetcore-runtime-6.0 gawk grep unzip bash socat && \ rm -rf /var/lib/apt/lists/* && \ wget https://enginedesigns.net/download/retroassembler.zip && \ diff --git a/Prime6502Assembly/solution_1/parse.sh b/Prime6502Assembly/solution_1/parse.sh index 3be8d4bdf..ba9a76730 100755 --- a/Prime6502Assembly/solution_1/parse.sh +++ b/Prime6502Assembly/solution_1/parse.sh @@ -1,4 +1,4 @@ -#/bin/bash +#!/bin/bash c1541 ./primes.d64 -read output,s ./output.txt > /dev/null if [ ! -f output.txt ]; then diff --git a/Prime6502Assembly/solution_1/run.sh b/Prime6502Assembly/solution_1/run.sh index 2703ef6e0..2d084d1d5 100755 --- a/Prime6502Assembly/solution_1/run.sh +++ b/Prime6502Assembly/solution_1/run.sh @@ -1,3 +1,3 @@ -#/bin/bash +#!/bin/bash c1541 -format primes,c1 d64 ./primes.d64 -write ./primes.prg x128 -autostart ./primes.d64 "$@" diff --git a/Prime6502Assembly/solution_2/Dockerfile b/Prime6502Assembly/solution_2/Dockerfile index a48f6dc8a..c58bd8448 100644 --- a/Prime6502Assembly/solution_2/Dockerfile +++ b/Prime6502Assembly/solution_2/Dockerfile @@ -1,13 +1,10 @@ -FROM primeimages/vice:3.5 +# We're sticking to VICE 3.5 because in later versions the sequential output file doesn't get +# closed when the "CLOSE" ROM routine is called, making it impossible for c1451 to read it. +FROM primeimages/vice:3.5-ubuntu22.04 WORKDIR /opt -RUN wget https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \ - dpkg -i packages-microsoft-prod.deb && \ - rm packages-microsoft-prod.deb && \ - apt-get update && \ - apt-get install -y apt-transport-https && \ - apt-get update && \ +RUN apt-get update && \ apt-get install -y aspnetcore-runtime-6.0 gawk grep unzip bash socat && \ rm -rf /var/lib/apt/lists/* && \ wget https://enginedesigns.net/download/retroassembler.zip && \ diff --git a/Prime6502Assembly/solution_2/parse.sh b/Prime6502Assembly/solution_2/parse.sh index dd821753e..6e52e89ec 100755 --- a/Prime6502Assembly/solution_2/parse.sh +++ b/Prime6502Assembly/solution_2/parse.sh @@ -1,4 +1,4 @@ -#/bin/bash +#!/bin/bash c1541 ./primes.d64 -read output,s ./output.txt > /dev/null if [ ! -f output.txt ]; then diff --git a/Prime6502Assembly/solution_2/run.sh b/Prime6502Assembly/solution_2/run.sh index b4184850c..e113bcbd5 100755 --- a/Prime6502Assembly/solution_2/run.sh +++ b/Prime6502Assembly/solution_2/run.sh @@ -1,3 +1,3 @@ -#/bin/bash +#!/bin/bash c1541 -format primes,c2 d64 ./primes.d64 -write ./primes.prg xpet -autostart ./primes.d64 "$@" From 3c425b5e11c603466e1a211ef19937c2db003173 Mon Sep 17 00:00:00 2001 From: Rutger van Bergen Date: Sat, 3 Feb 2024 16:13:13 +0100 Subject: [PATCH 6/6] Update Chape and COMAL base images --- PrimeCOMAL/solution_2/Dockerfile | 2 +- PrimeChapel/solution_1/Dockerfile | 2 +- PrimeChapel/solution_1/primes.chpl | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PrimeCOMAL/solution_2/Dockerfile b/PrimeCOMAL/solution_2/Dockerfile index b471e06c0..1953e0138 100644 --- a/PrimeCOMAL/solution_2/Dockerfile +++ b/PrimeCOMAL/solution_2/Dockerfile @@ -1,4 +1,4 @@ -FROM primeimages/opencomal:0.3.0 +FROM primeimages/opencomal:0.3.0-ubuntu22.04 RUN apt-get update && apt-get install -y socat && apt-get clean && rm -rf /var/lib/apt/lists/* diff --git a/PrimeChapel/solution_1/Dockerfile b/PrimeChapel/solution_1/Dockerfile index 34945040e..851982b72 100644 --- a/PrimeChapel/solution_1/Dockerfile +++ b/PrimeChapel/solution_1/Dockerfile @@ -1,4 +1,4 @@ -FROM primeimages/chapel:1.24.1 +FROM primeimages/chapel:1.33.0 WORKDIR /opt/app COPY primes.chpl . diff --git a/PrimeChapel/solution_1/primes.chpl b/PrimeChapel/solution_1/primes.chpl index 9ff410b5b..484e7e295 100644 --- a/PrimeChapel/solution_1/primes.chpl +++ b/PrimeChapel/solution_1/primes.chpl @@ -6,7 +6,7 @@ // computed `goto`, must use an array of // classes emulating first class functions with captures... -use Time; use BitOps; use CPtr; +use Time; use BitOps; use CTypes; type Prime = uint(64); @@ -433,7 +433,7 @@ proc benchmark(tech: Techniques, multi: bool = false) { else "extreme_hybrid;"; writeln(lbl, passes, ";", duration, ";", thrds, ";algorithm=base,faithful=yes,bits=1"); } - else { writeln("Invalid result!!!"); } + else { writeln("Invalid result!!!"); } } for t in Techniques do benchmark(t);