Add setlX image

Dockerfile

@@ -34,4 +34,4 @@ COPY --from=build /opt/myriad .
 
 EXPOSE 8081
 
-ENTRYPOINT ["./myriad"]
+CMD ["./myriad"]

Dockerfile.release

@@ -16,4 +16,4 @@ COPY --from=build /tmp/myriad .
 
 EXPOSE 8081
 
-ENTRYPOINT ["./myriad"]
+CMD ["./myriad"]

languages/brainfuck/Dockerfile

@@ -1,12 +1,12 @@
 FROM alpine AS build
 
+RUN apk update && apk add g++
 COPY bf.cpp .
-RUN apk add --no-cache g++ && \
+RUN g++ bf.cpp -o bf
-    g++ bf.cpp -o bf
 
 FROM alpine
 LABEL author="1Computer1"
 
-RUN apk add --no-cache libstdc++
+RUN apk update && apk add libstdc++
 COPY --from=build bf /usr/local/bin/
 COPY run.sh /var/run/

languages/c/Dockerfile

@@ -1,6 +1,7 @@
 FROM alpine
 LABEL author="1Computer1"
 
-RUN apk add --no-cache gcc libc-dev
+RUN apk update
+RUN apk add gcc libc-dev
 
 COPY run.sh /var/run/

languages/cpp/Dockerfile

@@ -1,6 +1,7 @@
 FROM alpine
 LABEL author="1Computer1"
 
-RUN apk add --no-cache g++
+RUN apk update
+RUN apk add g++
 
 COPY run.sh /var/run/

languages/d/Dockerfile

@@ -0,0 +1,6 @@
+FROM alpine
+LABEL author="SunRed"
+
+RUN apk add --no-cache musl-dev gcc ldc
+
+COPY run.sh /var/run/

languages/d/run.sh

@@ -0,0 +1,2 @@
+cat > program.d
+ldc2 program.d -of program && ./program

languages/haskell/Dockerfile

@@ -1,17 +1,14 @@
-FROM debian:stable-slim
+FROM debian:stretch
 LABEL author="1Computer1"
 ENV LANG C.UTF-8
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends gnupg dirmngr ca-certificates && \
+    apt-get install -y --no-install-recommends gnupg dirmngr && \
-    echo 'deb https://downloads.haskell.org/debian stretch main' > /etc/apt/sources.list.d/ghc.list && \
+    echo 'deb http://downloads.haskell.org/debian stretch main' > /etc/apt/sources.list.d/ghc.list && \
     apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA3CBA3FFE22B574 && \
     apt-get update && \
-    apt-get install -y --no-install-recommends ghc-9.0.1 && \
+    apt-get install -y --no-install-recommends ghc-8.6.5
-    apt-get purge -y gnupg dirmngr ca-certificates && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
 
-ENV PATH /opt/ghc/9.0.1/bin:$PATH
+ENV PATH /opt/ghc/8.6.5/bin:$PATH
 
 COPY run.sh /var/run/

languages/idris/Dockerfile

@@ -2,7 +2,6 @@ FROM alpine:latest
 
 RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
     apk update && \
-    apk add idris@testing && \
+    apk add idris@testing
-    rm -rf /var/cache/apk/*
 
 COPY run.sh /var/run/

languages/java/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:17-alpine
+FROM openjdk:13-alpine
 LABEL author="1Computer1"
 
 COPY run.sh /var/run/

languages/javascript/run.sh

@@ -1 +1 @@
-cat | node
+cat | node -p

languages/lua/Dockerfile

@@ -1,5 +1,6 @@
 FROM alpine
 
-RUN apk add --no-cache lua5.3
+RUN apk update
+RUN apk add lua5.3
 
 COPY run.sh /var/run/

languages/setlx/Dockerfile

@@ -0,0 +1,17 @@
+FROM openjdk:17-alpine
+LABEL author="SunRed"
+
+COPY setlX /usr/local/bin/
+COPY run.sh /var/run/
+
+RUN apk add --no-cache curl unzip bash && \
+    curl -O https://download.randoom.org/setlX/pc/setlX_v2-7-2.binary_only.zip && \
+    unzip -d setlx setlX_v2-7-2.binary_only.zip && \
+    rm -f setlX_v2-7-2.binary_only.zip && \
+    mkdir -p /usr/local/setlX && \
+    mv setlx/setlX*.jar /usr/local/setlX && \
+    mkdir -p /usr/local/setlXlibrary && \
+    mv setlx/setlXlibrary/* /usr/local/setlXlibrary && \
+    chmod +x /usr/local/bin/setlX && \
+    rm -rf setlx && \
+    apk del --no-cache curl unzip

languages/setlx/run.sh

@@ -0,0 +1,2 @@
+cat > program.stlx
+bash /usr/local/bin/setlX ./program.stlx

languages/setlx/setlX

@@ -0,0 +1,65 @@
+#!/bin/bash
+#
+#
+# launcher script for the setlX interpreter on Unix-like systems
+#
+#
+
+# insert path to the folder where you copied the jar files here
+setlXJarDirectory="/usr/local/setlX/"
+
+# insert full path to library location here
+setlXlibraryPath="/usr/local/setlXlibrary/"
+
+############################## additional options ##############################
+javaParameters=""
+
+# uncomment to force execution in 64 bit mode
+#javaParameters="$javaParameters -d64"
+
+# uncomment to execute with increased memory size (6GB) (>2GB needs 64 Bit mode!)
+#javaParameters="$javaParameters -Xmx6144m"
+
+# uncomment to execute with increased stack size
+#javaParameters="$javaParameters -Xss48m"
+
+################################################################################
+
+if [ -n "$OVERRIDE_setlXJarDirectory" ]
+  then
+    setlXJarDirectory="$OVERRIDE_setlXJarDirectory"
+fi
+if [ -n "$OVERRIDE_setlXjavaParameters" ]
+  then
+    javaParameters="$OVERRIDE_setlXjavaParameters"
+fi
+if [ -z "$SETLX_LIBRARY_PATH" ]
+  then
+    export SETLX_LIBRARY_PATH="$setlXlibraryPath"
+fi
+
+java_call="java"
+
+if [[ -z "$INSIDE_EMACS" && $(which rlwrap > /dev/null 2>&1; echo $?) -eq 0 ]]
+  then
+    java_call="rlwrap -C $(basename $0) $java_call"
+fi
+
+jarFiles=""
+while read -r -d $'\0' jarname
+  do
+    if [ -n "$jarFiles" ]
+      then
+        jarFiles="$jarFiles:"
+    fi
+    jarFiles="$jarFiles${jarname#./}"
+done < <( find "$setlXJarDirectory" -maxdepth 1 -name "*.jar" -print0 )
+
+if [ -n "$jarFiles" ]
+  then
+    $java_call -cp "$jarFiles:$CLASSPATH" $javaParameters org.randoom.setlx.pc.ui.SetlX "$@"
+    exit $?
+else
+    echo "The setlX jar files cannot be found!"
+    exit 1
+fi

languages/typescript/run.sh

@@ -1,4 +1,4 @@
 cat > program.ts
 tsc --lib DOM,ESNext --target ES2019 --strict \
     --skipLibCheck --types /usr/local/share/.config/yarn/global/node_modules/@types/node program.ts \
-    && cat program.js | node
+    && cat program.js | node -p 

src/Myriad/Docker.hs

@@ -40,19 +40,13 @@ data EvalResult
 buildImage :: Language -> Myriad ()
 buildImage lang = do
     env <- ask
-    logInfo ["Checking for image ", cs $ imageName lang]
+    logInfo ["Building image ", cs $ imageName lang]
-    res <- try $ exec ["docker images -q ", imageName lang]
+    exec_ ["docker build -t ", imageName lang, " ", cs (env ^. #languagesDir) </> cs (lang ^. #name)]
-    case res of
+    setupQSems
-        Left (SomeException err) -> logError ["An exception occured when checking for image ", cs $ imageName lang, ":\n", cs $ show err]
+    logInfo ["Built image ", cs $ imageName lang]
-        Right s -> do
+    when (env ^. #config % #prepareContainers) . void $ setupContainer lang
-            when (BL.null s) . void $ do -- If string is empty that means the image does not yet exist
-                logInfo ["Building image ", cs $ imageName lang]
-                exec_ ["docker build -t ", imageName lang, " ", cs (env ^. #languagesDir) </> cs (lang ^. #name)]
-                logInfo ["Built image ", cs $ imageName lang]
-            setupQSems
-            when (env ^. #config % #prepareContainers) . void $ setupContainer lang
     where
-        setupQSems :: Myriad ()
+        setupQSems ::  Myriad ()
         setupQSems = do
             env <- ask
             csem <- newQSem 1 -- We only want one container to be set up at a time