Add perl6

JRaspass · JRaspass · commit c5468f037afa · 2017-06-13T00:34:47.000+01:00
diff --git a/build-langs b/build-langs
@@ -2,34 +2,19 @@
 
 docker pull alpine:edge
 
-pwd=`pwd`
+cd containers
 
-# Perl & Ruby
-for lang in perl ruby; do
-    cd $pwd/containers/$lang
+for lang in *; do
+    mkdir -p $lang/rootfs/old-root
 
-    docker build -t $lang-build .
+    docker build -t $lang $lang
 
-    id=`docker run -d $lang-build true`
+    id=`docker run -d $lang -v`
 
-    rm -fr rootfs
-    mkdir -p rootfs/lib rootfs/old-root rootfs/usr/{bin,lib}
+    docker export $id | tar -C $lang/rootfs -xf -
 
-    docker cp $id:/lib/ld-musl-x86_64.so.1 rootfs/lib
-    docker cp $id:/usr/bin/$lang           rootfs/usr/bin
+    docker rm -f $id
 
-    if [ $lang = 'perl' ]; then
-        docker cp $id:/usr/lib/perl5 rootfs/usr/lib
-    else
-        docker cp $id:/usr/lib/$lang rootfs/usr/lib
-    fi
-
-    docker rm $id
+    # Remove the crap we gained from running the container, this is hacky.
+    rm -r $lang/rootfs/{.dockerenv,dev,etc,proc,sys}
 done
-
-# Cleanup
-cd ..
-
-sudo chown -R $USER: */rootfs
-
-find */rootfs/usr/lib -regex '.*\.\(h\|md\|pod\)' -delete
diff --git a/code-golf.go b/code-golf.go
@@ -230,7 +230,6 @@ func runCode(lang, code string) string {
 	var out bytes.Buffer
 
 	cmd := exec.Cmd{
-		Args:   []string{"perl", "/usr/bin/" + lang},
 		Dir:    "containers/" + lang,
 		Path:   "../../run-container",
 		Stderr: os.Stdout,
@@ -241,6 +240,22 @@ func runCode(lang, code string) string {
 		},
 	}
 
+	// $binary, @new_argv where $new_argv[0] is used for hostname too.
+	switch lang {
+	case "perl6":
+		cmd.Args = []string{
+			"/usr/bin/moar",
+			"perl6",
+			"--execname=perl6",
+			"--libpath=/usr/share/nqp/lib",
+			"--libpath=/usr/share/perl6/runtime",
+			"/usr/share/perl6/runtime/perl6.moarvm",
+			"-",
+		}
+	default:
+		cmd.Args = []string{"/usr/bin/" + lang, lang}
+	}
+
 	if err := cmd.Start(); err != nil {
 		panic(err)
 	}
diff --git a/containers/perl/Dockerfile b/containers/perl/Dockerfile
@@ -11,3 +11,13 @@ RUN cd perl-5.26.0                              \
     -des                                        \
  && make                                        \
  && make install-strip
+
+RUN find /usr/lib/perl5 -regex '.*\.\(h\|pod\)' -delete
+
+FROM scratch
+
+COPY --from=0 /lib/ld-musl-x86_64.so.1 /lib/
+COPY --from=0 /usr/bin/perl            /usr/bin/
+COPY --from=0 /usr/lib/perl5           /usr/lib/perl5
+
+ENTRYPOINT ["/usr/bin/perl"]
diff --git a/containers/perl6/Dockerfile b/containers/perl6/Dockerfile
@@ -0,0 +1,20 @@
+FROM alpine:edge
+
+RUN apk add --no-cache curl gcc linux-headers make musl-dev perl
+
+RUN curl http://rakudo.org/downloads/star/rakudo-star-2017.04.tar.gz \
+  | tar xzf -
+
+RUN cd rakudo-star-2017.04                                    \
+ && perl Configure.pl --backend=moar --gen-moar --prefix=/usr \
+ && make install
+
+FROM scratch
+
+COPY --from=0 /lib/ld-musl-x86_64.so.1 /lib/
+COPY --from=0 /usr/bin/moar            /usr/bin/
+COPY --from=0 /usr/lib/libmoar.so      /usr/lib/
+COPY --from=0 /usr/share/nqp           /usr/share/nqp
+COPY --from=0 /usr/share/perl6         /usr/share/perl6
+
+ENTRYPOINT ["/usr/bin/moar"]
diff --git a/containers/ruby/Dockerfile b/containers/ruby/Dockerfile
@@ -11,3 +11,13 @@ RUN cd ruby-2.4.1         \
     --prefix=/usr         \
  && make                  \
  && make install
+
+RUN find /usr/lib/ruby -name '*.md' -delete
+
+FROM scratch
+
+COPY --from=0 /lib/ld-musl-x86_64.so.1 /lib/
+COPY --from=0 /usr/bin/ruby            /usr/bin/
+COPY --from=0 /usr/lib/ruby            /usr/lib/ruby
+
+ENTRYPOINT ["/usr/bin/ruby"]
diff --git a/run-container.c b/run-container.c
@@ -60,7 +60,7 @@ int main(int argc, char const* const argv[]) {
     if (call2(SYS_umount2, "/old-root", MNT_DETACH) < 0)
         die("umount");
 
-    if (call2(SYS_sethostname, argv[0], strlen(argv[0])) < 0)
+    if (call2(SYS_sethostname, argv[1], strlen(argv[1])) < 0)
         die("host");
 
     if (call1(SYS_setgid, GID_nobody) < 0)
@@ -69,7 +69,7 @@ int main(int argc, char const* const argv[]) {
     if (call1(SYS_setuid, UID_nobody) < 0)
         die("setuid");
 
-    call1(SYS_execve, argv[1]);
+    call2(SYS_execve, argv[0], argv + 1);
     die("exec");
 
     return 0;
