17 files changed, 162 insertions, 33 deletions
diff --git a/dist/linux/docker/build-fedora26+mcode b/dist/linux/docker/build-fedora26+mcode
deleted file mode 100644
index fb0aaee9d..000000000
--- a/dist/linux/docker/build-fedora26+mcode
+++ /dev/null
@@ -1,5 +0,0 @@
-# Fedora 26
-FROM fedora:26
-
-RUN dnf --nodocs -y install gcc-gnat zlib-devel make \
-  && dnf clean all
diff --git a/dist/linux/docker/build-stretch+mcode b/dist/linux/docker/build-stretch+mcode
deleted file mode 100644
index 2830f0769..000000000
--- a/dist/linux/docker/build-stretch+mcode
+++ /dev/null
@@ -1,7 +0,0 @@
-# Debian 9
-FROM debian:stretch-slim
-
-RUN apt-get update -qq \
-  && apt-get -y install --no-install-recommends \
-            gnat gcc make zlib1g-dev \
-  && apt-get clean
diff --git a/dist/linux/docker/build-stretch+mcode+gpl b/dist/linux/docker/build-stretch+mcode+gpl
deleted file mode 100644
index 2830f0769..000000000
--- a/dist/linux/docker/build-stretch+mcode+gpl
+++ /dev/null
@@ -1,7 +0,0 @@
-# Debian 9
-FROM debian:stretch-slim
-
-RUN apt-get update -qq \
-  && apt-get -y install --no-install-recommends \
-            gnat gcc make zlib1g-dev \
-  && apt-get clean
diff --git a/dist/linux/docker/build-ubuntu14+llvm-3.8 b/dist/linux/docker/build-ubuntu14+llvm-3.8
deleted file mode 100644
index e90ab7bbc..000000000
--- a/dist/linux/docker/build-ubuntu14+llvm-3.8
+++ /dev/null
@@ -1,7 +0,0 @@
-# Ubuntu 14
-FROM ubuntu:trusty
-
-RUN apt-get update -qq \
-  && apt-get -y install --no-install-recommends \
-            gnat gcc make zlib1g-dev llvm-3.8-dev clang-3.8 \
-  && apt-get clean
diff --git a/dist/linux/docker/build-ubuntu14+mcode b/dist/linux/docker/build-ubuntu14+mcode
deleted file mode 100644
index 6756dc35f..000000000
--- a/dist/linux/docker/build-ubuntu14+mcode
+++ /dev/null
@@ -1,7 +0,0 @@
-# Ubuntu 14
-FROM ubuntu:trusty
-
-RUN apt-get update -qq \
-  && apt-get -y install --no-install-recommends \
-            gnat gcc make zlib1g-dev \
-  && apt-get clean
diff --git a/dist/linux/docker/build/buster b/dist/linux/docker/build/buster
new file mode 100644
index 000000000..776b51485
--- /dev/null
+++ b/dist/linux/docker/build/buster
@@ -0,0 +1,11 @@
+# [build] Debian 10
+
+FROM debian:buster-slim AS mcode
+
+RUN apt-get update -qq \
+  && apt-get -y install --no-install-recommends \
+            gnat gcc make zlib1g-dev \
+  && apt-get autoclean && apt-get clean && apt-get autoremove
+
+
+FROM mcode AS mcode-gpl
diff --git a/dist/linux/docker/build/fedora26 b/dist/linux/docker/build/fedora26
new file mode 100644
index 000000000..dfbf99a6c
--- /dev/null
+++ b/dist/linux/docker/build/fedora26
@@ -0,0 +1,12 @@
+# [build] Fedora 26
+
+FROM fedora:26 AS mcode
+
+RUN dnf --nodocs -y install gcc-gnat zlib-devel make \
+  && dnf clean all --enablerepo=\*
+
+
+FROM mcode AS llvm
+
+RUN dnf --nodocs -y install llvm-devel gcc-c++ clang \
+    && dnf clean all --enablerepo=\*
diff --git a/dist/linux/docker/build/stretch b/dist/linux/docker/build/stretch
new file mode 100644
index 000000000..9803a5619
--- /dev/null
+++ b/dist/linux/docker/build/stretch
@@ -0,0 +1,11 @@
+# [build] Debian 9
+
+FROM debian:stretch-slim AS mcode
+
+RUN apt-get update -qq \
+  && apt-get -y install --no-install-recommends \
+            gnat gcc make zlib1g-dev \
+  && apt-get autoclean && apt-get clean && apt-get autoremove
+
+
+FROM mcode AS mcode-gpl
diff --git a/dist/linux/docker/build/ubuntu14 b/dist/linux/docker/build/ubuntu14
new file mode 100644
index 000000000..924fd7297
--- /dev/null
+++ b/dist/linux/docker/build/ubuntu14
@@ -0,0 +1,16 @@
+# [build] Ubuntu 14
+
+FROM ubuntu:trusty AS mcode
+
+RUN apt-get update -qq \
+  && apt-get -y install --no-install-recommends \
+            gnat gcc make zlib1g-dev \
+  && apt-get autoclean && apt-get clean && apt-get autoremove
+
+
+FROM mcode AS llvm-3.8
+
+RUN apt-get update -qq \
+  && apt-get -y install --no-install-recommends \
+            llvm-3.8-dev clang-3.8 \
+  && apt-get autoclean && apt-get clean && apt-get autoremove
diff --git a/dist/linux/docker/build/ubuntu16 b/dist/linux/docker/build/ubuntu16
new file mode 100644
index 000000000..308377e19
--- /dev/null
+++ b/dist/linux/docker/build/ubuntu16
@@ -0,0 +1,16 @@
+# [build] Ubuntu 16
+
+FROM ubuntu:xenial AS mcode
+
+RUN apt-get update -qq \
+  && apt-get -y install --no-install-recommends \
+            gnat gcc make zlib1g-dev \
+  && apt-get autoclean && apt-get clean && apt-get autoremove
+
+
+FROM mcode AS llvm-3.9
+
+RUN apt-get update -qq \
+  && apt-get -y install --no-install-recommends \
+            llvm-3.9-dev clang-3.9 \
+  && apt-get autoclean && apt-get clean && apt-get autoremove
diff --git a/dist/linux/docker/build/ubuntu18 b/dist/linux/docker/build/ubuntu18
new file mode 100644
index 000000000..ac514a554
--- /dev/null
+++ b/dist/linux/docker/build/ubuntu18
@@ -0,0 +1,16 @@
+# [build] Ubuntu 18
+
+FROM ubuntu:bionic AS mcode
+
+RUN apt-get update -qq \
+  && apt-get -y install --no-install-recommends \
+            gnat gcc make zlib1g-dev \
+  && apt-get autoclean && apt-get clean && apt-get autoremove
+
+
+FROM mcode AS llvm-5.0
+
+RUN apt-get update -qq \
+  && apt-get -y install --no-install-recommends \
+            llvm-5.0-dev clang-5.0 \
+  && apt-get autoclean && apt-get clean && apt-get autoremove
diff --git a/dist/linux/docker/run/buster b/dist/linux/docker/run/buster
new file mode 100644
index 000000000..ff5bbf3da
--- /dev/null
+++ b/dist/linux/docker/run/buster
@@ -0,0 +1,10 @@
+# [run] Debian 10
+
+FROM debian:buster-slim AS mcode
+
+RUN apt-get update -qq \
+ && apt-get -y install libgnat-7 gcc libc6-dev \
+ && apt-get autoclean && apt-get clean && apt-get autoremove
+
+
+FROM mcode AS mcode-gpl
diff --git a/dist/linux/docker/run/fedora26 b/dist/linux/docker/run/fedora26
new file mode 100644
index 000000000..ff0e17bc2
--- /dev/null
+++ b/dist/linux/docker/run/fedora26
@@ -0,0 +1,12 @@
+# [run] Fedora 26
+
+FROM fedora:26 AS mcode
+
+RUN dnf --nodocs -y install libgnat gcc \
+  && dnf clean all --enablerepo=\*
+
+
+FROM mcode AS llvm
+
+RUN dnf --nodocs -y install llvm-libs zlib-devel \
+  && dnf clean all --enablerepo=\*
diff --git a/dist/linux/docker/run/stretch b/dist/linux/docker/run/stretch
new file mode 100644
index 000000000..1d42722eb
--- /dev/null
+++ b/dist/linux/docker/run/stretch
@@ -0,0 +1,10 @@
+# [run] Debian 9
+
+FROM debian:stretch-slim AS mcode
+
+RUN apt-get update -qq \
+ && apt-get -y install libgnat-6 gcc libc6-dev \
+ && apt-get autoclean && apt-get clean && apt-get autoremove
+
+
+FROM mcode AS mcode-gpl
diff --git a/dist/linux/docker/run/ubuntu14 b/dist/linux/docker/run/ubuntu14
new file mode 100644
index 000000000..6c72d9c19
--- /dev/null
+++ b/dist/linux/docker/run/ubuntu14
@@ -0,0 +1,16 @@
+# [run] Ubuntu 14
+
+FROM ubuntu:trusty AS mcode
+
+RUN apt-get update -qq \
+  && apt-get -y install --no-install-recommends \
+            libgnat-4.6 gcc libc6-dev \
+  && apt-get autoclean && apt-get clean && apt-get autoremove
+
+
+FROM mcode AS llvm-3.8
+
+RUN apt-get update -qq \
+  && apt-get -y install --no-install-recommends \
+            libllvm-3.8 zlib1g-dev \
+  && apt-get autoclean && apt-get clean && apt-get autoremove
diff --git a/dist/linux/docker/run/ubuntu16 b/dist/linux/docker/run/ubuntu16
new file mode 100644
index 000000000..2bccad554
--- /dev/null
+++ b/dist/linux/docker/run/ubuntu16
@@ -0,0 +1,16 @@
+# [run] Ubuntu 16
+
+FROM ubuntu:xenial AS mcode
+
+RUN apt-get update -qq \
+  && apt-get -y install --no-install-recommends \
+            libgnat-4.9 gcc libc6-dev \
+  && apt-get autoclean && apt-get clean && apt-get autoremove
+
+
+FROM mcode AS llvm-3.9
+
+RUN apt-get update -qq \
+  && apt-get -y install --no-install-recommends \
+            libllvm-3.9 zlib1g-dev \
+  && apt-get autoclean && apt-get clean && apt-get autoremove
diff --git a/dist/linux/docker/run/ubuntu18 b/dist/linux/docker/run/ubuntu18
new file mode 100644
index 000000000..1b2f956ac
--- /dev/null
+++ b/dist/linux/docker/run/ubuntu18
@@ -0,0 +1,16 @@
+# [run] Ubuntu 18
+
+FROM ubuntu:bionic AS mcode
+
+RUN apt-get update -qq \
+  && apt-get -y install --no-install-recommends \
+            libgnat-7 gcc libc6-dev \
+  && apt-get autoclean && apt-get clean && apt-get autoremove
+
+
+FROM mcode AS llvm-5.0
+
+RUN apt-get update -qq \
+  && apt-get -y install --no-install-recommends \
+            libllvm5.0 zlib1g-dev \
+  && apt-get autoclean && apt-get clean && apt-get autoremove