From 26e49b3db531be6a32100ff069f3a83e5b33308d Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 12 May 2021 07:43:19 +0200 Subject: [PATCH 1/4] Add dlang image --- languages/d/Dockerfile | 6 ++++++ languages/d/run.sh | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 languages/d/Dockerfile create mode 100644 languages/d/run.sh diff --git a/languages/d/Dockerfile b/languages/d/Dockerfile new file mode 100644 index 0000000..4bb50e1 --- /dev/null +++ b/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/ diff --git a/languages/d/run.sh b/languages/d/run.sh new file mode 100644 index 0000000..ae18bab --- /dev/null +++ b/languages/d/run.sh @@ -0,0 +1,2 @@ +cat > program.d +ldc2 program.d -of program && ./program From 5858e89fabff9e75ce8966cb832f75c2f4ef425a Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 12 May 2021 07:43:41 +0200 Subject: [PATCH 2/4] Add setlX image --- languages/setlx/Dockerfile | 17 ++++++++++ languages/setlx/run.sh | 2 ++ languages/setlx/setlX | 65 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) create mode 100644 languages/setlx/Dockerfile create mode 100644 languages/setlx/run.sh create mode 100644 languages/setlx/setlX diff --git a/languages/setlx/Dockerfile b/languages/setlx/Dockerfile new file mode 100644 index 0000000..ff541cd --- /dev/null +++ b/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 diff --git a/languages/setlx/run.sh b/languages/setlx/run.sh new file mode 100644 index 0000000..b8c4ec3 --- /dev/null +++ b/languages/setlx/run.sh @@ -0,0 +1,2 @@ +cat > program.stlx +bash /usr/local/bin/setlX ./program.stlx diff --git a/languages/setlx/setlX b/languages/setlx/setlX new file mode 100644 index 0000000..67a8e00 --- /dev/null +++ b/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 From e54e191f1b074b0a598d6334a2e27ddee9d4491e Mon Sep 17 00:00:00 2001 From: Manuel Date: Fri, 21 May 2021 05:53:13 +0200 Subject: [PATCH 3/4] Check if image exists before building (#12) --- src/Myriad/Docker.hs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/Myriad/Docker.hs b/src/Myriad/Docker.hs index e94b809..3e67655 100644 --- a/src/Myriad/Docker.hs +++ b/src/Myriad/Docker.hs @@ -40,13 +40,19 @@ data EvalResult buildImage :: Language -> Myriad () buildImage lang = do env <- ask - logInfo ["Building image ", cs $ imageName lang] - exec_ ["docker build -t ", imageName lang, " ", cs (env ^. #languagesDir) cs (lang ^. #name)] - setupQSems - logInfo ["Built image ", cs $ imageName lang] - when (env ^. #config % #prepareContainers) . void $ setupContainer lang + logInfo ["Checking for image ", cs $ imageName lang] + res <- try $ exec ["docker images -q ", imageName lang] + case res of + Left (SomeException err) -> logError ["An exception occured when checking for image ", cs $ imageName lang, ":\n", cs $ show err] + Right s -> do + 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 From 1205933acdcf7ceb8f3ca901d3382629caeebf1d Mon Sep 17 00:00:00 2001 From: Manuel Date: Mon, 31 May 2021 06:20:21 +0200 Subject: [PATCH 4/4] Update images and reduce their size (#13) * Allow container to be run with custom command * Reduce language image sizes * Update OpenJDK to latest version * Use swc for TypeScript and don't print by default * Update Haskell image and use stable Debian slim * Fix formatting and revert TS changes --- Dockerfile | 2 +- Dockerfile.release | 2 +- languages/brainfuck/Dockerfile | 6 +++--- languages/c/Dockerfile | 3 +-- languages/cpp/Dockerfile | 3 +-- languages/haskell/Dockerfile | 13 ++++++++----- languages/idris/Dockerfile | 3 ++- languages/java/Dockerfile | 2 +- languages/javascript/run.sh | 2 +- languages/lua/Dockerfile | 3 +-- languages/typescript/run.sh | 2 +- 11 files changed, 21 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index 624994b..fbf8add 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,4 +34,4 @@ COPY --from=build /opt/myriad . EXPOSE 8081 -CMD ["./myriad"] \ No newline at end of file +ENTRYPOINT ["./myriad"] \ No newline at end of file diff --git a/Dockerfile.release b/Dockerfile.release index 95b951b..e5e0c43 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -16,4 +16,4 @@ COPY --from=build /tmp/myriad . EXPOSE 8081 -CMD ["./myriad"] \ No newline at end of file +ENTRYPOINT ["./myriad"] \ No newline at end of file diff --git a/languages/brainfuck/Dockerfile b/languages/brainfuck/Dockerfile index 067f601..34b74b3 100644 --- a/languages/brainfuck/Dockerfile +++ b/languages/brainfuck/Dockerfile @@ -1,12 +1,12 @@ FROM alpine AS build -RUN apk update && apk add g++ COPY bf.cpp . -RUN g++ bf.cpp -o bf +RUN apk add --no-cache g++ && \ + g++ bf.cpp -o bf FROM alpine LABEL author="1Computer1" -RUN apk update && apk add libstdc++ +RUN apk add --no-cache libstdc++ COPY --from=build bf /usr/local/bin/ COPY run.sh /var/run/ diff --git a/languages/c/Dockerfile b/languages/c/Dockerfile index 1324766..862b281 100644 --- a/languages/c/Dockerfile +++ b/languages/c/Dockerfile @@ -1,7 +1,6 @@ FROM alpine LABEL author="1Computer1" -RUN apk update -RUN apk add gcc libc-dev +RUN apk add --no-cache gcc libc-dev COPY run.sh /var/run/ diff --git a/languages/cpp/Dockerfile b/languages/cpp/Dockerfile index 37bc37b..2242843 100644 --- a/languages/cpp/Dockerfile +++ b/languages/cpp/Dockerfile @@ -1,7 +1,6 @@ FROM alpine LABEL author="1Computer1" -RUN apk update -RUN apk add g++ +RUN apk add --no-cache g++ COPY run.sh /var/run/ diff --git a/languages/haskell/Dockerfile b/languages/haskell/Dockerfile index ad6b169..6039727 100644 --- a/languages/haskell/Dockerfile +++ b/languages/haskell/Dockerfile @@ -1,14 +1,17 @@ -FROM debian:stretch +FROM debian:stable-slim LABEL author="1Computer1" ENV LANG C.UTF-8 RUN apt-get update && \ - apt-get install -y --no-install-recommends gnupg dirmngr && \ - echo 'deb http://downloads.haskell.org/debian stretch main' > /etc/apt/sources.list.d/ghc.list && \ + apt-get install -y --no-install-recommends gnupg dirmngr ca-certificates && \ + echo 'deb https://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-8.6.5 + apt-get install -y --no-install-recommends ghc-9.0.1 && \ + apt-get purge -y gnupg dirmngr ca-certificates && \ + apt-get autoremove -y && \ + apt-get autoclean -y -ENV PATH /opt/ghc/8.6.5/bin:$PATH +ENV PATH /opt/ghc/9.0.1/bin:$PATH COPY run.sh /var/run/ diff --git a/languages/idris/Dockerfile b/languages/idris/Dockerfile index 04b8d8f..418b58f 100644 --- a/languages/idris/Dockerfile +++ b/languages/idris/Dockerfile @@ -2,6 +2,7 @@ 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/ diff --git a/languages/java/Dockerfile b/languages/java/Dockerfile index dcc0975..e78541e 100644 --- a/languages/java/Dockerfile +++ b/languages/java/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:13-alpine +FROM openjdk:17-alpine LABEL author="1Computer1" COPY run.sh /var/run/ diff --git a/languages/javascript/run.sh b/languages/javascript/run.sh index 6e087ee..faceee1 100644 --- a/languages/javascript/run.sh +++ b/languages/javascript/run.sh @@ -1 +1 @@ -cat | node -p +cat | node diff --git a/languages/lua/Dockerfile b/languages/lua/Dockerfile index 0835675..c15ec01 100644 --- a/languages/lua/Dockerfile +++ b/languages/lua/Dockerfile @@ -1,6 +1,5 @@ FROM alpine -RUN apk update -RUN apk add lua5.3 +RUN apk add --no-cache lua5.3 COPY run.sh /var/run/ diff --git a/languages/typescript/run.sh b/languages/typescript/run.sh index 4d12a04..4fccb05 100644 --- a/languages/typescript/run.sh +++ b/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 -p + && cat program.js | node