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

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

Dockerfile.release

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

languages/arnoldc/Dockerfile

@@ -1,9 +0,0 @@
-FROM openjdk:17-alpine
-LABEL author="SunRed"
-
-RUN apk add --no-cache curl && \
-    curl -O http://lhartikk.github.io/ArnoldC.jar && \
-    mv ArnoldC.jar /var/run && \
-    apk del --no-cache curl
-
-COPY run.sh /var/run/

languages/arnoldc/run.sh

@@ -1,2 +0,0 @@
-cat > program.arnoldc
-java -jar /var/run/ArnoldC.jar program.arnoldc && java program

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/

languages/c/Dockerfile

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

languages/cpp/Dockerfile

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

languages/emojicode/Dockerfile

@@ -1,57 +0,0 @@
-FROM debian:stable-slim as build
-
-ENV CC clang-8
-ENV CXX clang++-8
-ENV DEBIAN_FRONTEND=nontinteractive
-ENV PYTHONIOENCODING utf8
-
-RUN \
-  apt-get update && \
-  apt-get install -y \
-    gnupg \
-    wget && \
-  echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" >> /etc/apt/sources.list && \
-  echo "deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" >> /etc/apt/sources.list && \
-  wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|apt-key add - && \
-  apt-get update && \
-  apt-get install -y \
-    clang-8 \
-    cmake \
-    libstdc++-8-dev \
-    libclang1-8 \
-    libclang-8-dev \
-    libclang-common-8-dev \
-    libfuzzer-8-dev \
-    libllvm8 \
-    libncurses-dev \
-    libz-dev \
-    llvm-8 \
-    llvm-8-dev \
-    llvm-runtime \
-    ninja-build \
-    python3 \
-    rsync \
-    git && \
-  rm -rf /var/lib/apt/lists/* && \
-  mkdir /tmp/emojicode/
-
-WORKDIR /tmp/emojicode/
-RUN git clone https://github.com/emojicode/emojicode.git .
-RUN cmake . -GNinja && \
-    ninja && \
-    ninja magicinstall
-
-
-FROM debian:stable-slim
-LABEL author="SunRed"
-
-ENV CXX=g++
-
-RUN apt-get update && \
-    apt-get install -y ${CXX} && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-COPY --from=build /usr/local/bin /usr/local/bin
-COPY --from=build /usr/local/EmojicodePackages /usr/local/EmojicodePackages
-COPY run.sh /var/run/

languages/emojicode/run.sh

@@ -1,2 +0,0 @@
-cat > program.emojic
-emojicodec program.emojic -o program && ./program

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 && \
+    apt-get install -y --no-install-recommends gnupg dirmngr ca-certificates && \
-    echo 'deb http://downloads.haskell.org/debian stretch main' > /etc/apt/sources.list.d/ghc.list && \
+    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/

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/

languages/java/Dockerfile

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

languages/javascript/run.sh

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

languages/lolcode/Dockerfile

@@ -1,15 +0,0 @@
-FROM alpine as build
-
-RUN apk add --no-cache build-base git cmake
-
-WORKDIR /tmp/lci
-RUN git clone https://github.com/justinmeza/lci.git .
-
-RUN cmake . && make
-
-
-FROM alpine
-LABEL author="SunRed"
-
-COPY --from=build /tmp/lci/lci /usr/local/bin
-COPY run.sh /var/run/

languages/lolcode/run.sh

@@ -1,2 +0,0 @@
-cat > program.lol
-lci program.lol

languages/lua/Dockerfile

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

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

src/Myriad/Docker.hs

@@ -40,13 +40,19 @@ data EvalResult
 buildImage :: Language -> Myriad ()
 buildImage lang = do
     env <- ask
-    logInfo ["Building image ", cs $ imageName lang]
+    logInfo ["Checking for image ", cs $ imageName lang]
-    exec_ ["docker build -t ", imageName lang, " ", cs (env ^. #languagesDir) </> cs (lang ^. #name)]
+    res <- try $ exec ["docker images -q ", imageName lang]
-    setupQSems
+    case res of
-    logInfo ["Built image ", cs $ imageName lang]
+        Left (SomeException err) -> logError ["An exception occured when checking for image ", cs $ imageName lang, ":\n", cs $ show err]
-    when (env ^. #config % #prepareContainers) . void $ setupContainer lang
+        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