Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update base images of several solutions #957

Merged
merged 8 commits into from
Feb 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions Prime6502Assembly/solution_1/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion Prime6502Assembly/solution_1/parse.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#/bin/bash
#!/bin/bash
c1541 ./primes.d64 -read output,s ./output.txt > /dev/null

if [ ! -f output.txt ]; then
Expand Down
2 changes: 1 addition & 1 deletion Prime6502Assembly/solution_1/run.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#/bin/bash
#!/bin/bash
c1541 -format primes,c1 d64 ./primes.d64 -write ./primes.prg
x128 -autostart ./primes.d64 "$@"
11 changes: 4 additions & 7 deletions Prime6502Assembly/solution_2/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion Prime6502Assembly/solution_2/parse.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#/bin/bash
#!/bin/bash
c1541 ./primes.d64 -read output,s ./output.txt > /dev/null

if [ ! -f output.txt ]; then
Expand Down
2 changes: 1 addition & 1 deletion Prime6502Assembly/solution_2/run.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#/bin/bash
#!/bin/bash
c1541 -format primes,c2 d64 ./primes.d64 -write ./primes.prg
xpet -autostart ./primes.d64 "$@"
2 changes: 1 addition & 1 deletion PrimeCOMAL/solution_2/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/*

Expand Down
2 changes: 1 addition & 1 deletion PrimeChapel/solution_1/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM primeimages/chapel:1.24.1
FROM primeimages/chapel:1.33.0

WORKDIR /opt/app
COPY primes.chpl .
Expand Down
4 changes: 2 additions & 2 deletions PrimeChapel/solution_1/primes.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down
Loading