Merge pull request #585 from 1138-4EB/split-docker

move docker-related resources to ghdl/docker

20 files changed, 24 insertions, 278 deletions

diff --git a/.travis.yml b/.travis.yml
index 29b635973..5fa18be79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,33 +8,13 @@ sudo: required
 services: docker
 language: minimal
 install: skip
-script: "./dist/linux/travis-ci.sh"
+script: "./dist/travis/travis-ci.sh"
 
 addons:
   apt:
     packages:
       - docker-ce
 
-deploy:
-  - &deploy-docker
-    provider: script
-    skip_cleanup: true
-    script: ./dist/linux/deploy2dockerhub.sh "$IMAGE" "$TRAVIS_COMMIT_MESSAGE"
-    on:
-      repo: 1138-4EB/ghdl
-      branch: master
-  - &deploy-releases
-    provider: releases
-    skip_cleanup: true
-    api_key:
-      secure: ji6LXOmD5V2N+ELHZr4oJsmxPhedk+8W6jfCqQdEbewQ42N+fKOq3lgqJni7ZdfpZaulB9OHPTApv3bwOjXjtN9rfBGmq//U9CwvzHmUeomdQv6WQOVevaWSXl3DNL9fk3yKynyFrsv4pvr45L8GIjaHLggKcYhNFPJ2rrnJlDoFT9MqQNpmP7Bg/LnwVQiv+ZDPkLlMWQzrXzLamdQILARPQka+kCdXl/sHH6OKvLgRvu9yvyXYSSfbyAHP+THISS5gDciizSBeWGlU75kgj/N+mkV+8NvtTTfEIgG8y49WJz6aBooTmRzk/jZW1dKMbDR6c5bpTmRvMZSzeSBuAR6WLhr6HevgCPi/1fX1y3pkVSrgBUF5KcxPgWCZp0I05QjaJOdvQDl1hH4TlVwpT18lM2+cWrui9fS7spnk/AuNKX882C5QWWRy28lIPasCVnwfeKX8a9KAwY9OqVOenoLC1yx7NJOGfH1bjuSYYxyR4XgLiGTHKALAuknCyD9QL0o378IwqxHMcsN0Gsd+GndMu0/b8GvSqfzDpV1XknqabQFwkZLs+Yydw0snfBUzXw9TfOk78IiPYEgXAxsQKBAkK7qvO36HIxLlSQXglXU1D4IDtQYDUel6vKll4pgu0WMxStQCbj51yDVJKvRhzwiBNC6Pwgzt2JTrpwM/T/U=
-    file: "ghdl-*.tgz"
-    file_glob: true
-    on:
-      repo: ghdl/ghdl
-      all_branches: true
-      tags: true
-
 # For each linux build, a different job/instance (with the constraints
 # above) is executed in parallel in stage 'test'.
 env:
@@ -45,32 +25,28 @@ env:
 #    - IMAGE=buster+mcode+gpl
     - IMAGE=ubuntu14+mcode
     - IMAGE=ubuntu14+llvm-3.8
-#    - IMAGE=ubuntu16+mcode
-#    - IMAGE=ubuntu16+llvm-3.9
 #    - IMAGE=ubuntu18+mcode
 #    - IMAGE=ubuntu18+llvm-5.0
     - IMAGE=fedora26+mcode
-#    - IMAGE=fedora26+llvm
-  global:
-    - secure: "MZHtYkWdYK+SeYzJvWD8I0tbkdHGjmWyNDn70a2RrNYFu363Zt51ZvksEtkjrS7kdje6l6VPfLjilX5UtywIM1Mg6nt/rsw4p62+bGhMyhfXiqS3eqEfH2sThjosy773X8iotm2sW0ax0oHX07ZLcuTbZ+TK2cMGarZ+LzNT8IiMaeaWu4W7aE5LRxSmVRwcACUOa3NiC7GY/qC7vU2C8QNdXSlU3fSp17K5eccrkkBuiEhRTsdr3ZIhjOjrYzqHKWC3a0uHn/fJsbepsVM6FGt+zAwo0VqdXXCE2ts8EOATvFgEaCGxUgfGd/yvNsAG7sjF3nweR9Z11dpMbBE+TjxlLCXQ31v1Oj7pH6vcgjCYV69cZiLbsDhxTJFQ08qbm3xK8dmTUXFy1scrMSd8D/Q3Uf0LjHkH5Q5dL8TOyqejs57fUTIBtBUpCTvvGOErdZQAOWJc93sC9RQB7BuCDR2yR7rPTJr4KUwspe1uScA/H9cQS2p42SeJ4+Yyjtwod3IQWjr6+/pdNPoImleOP0dXSDCXpAIsbv6TR9curS3geLJuTmu5UnLzbURDr7Whtop3lCPbiN0H9jThSuyIxWUI+6JDGDG89RXbCyZvGz97sIShYstWg0U0xLWmw9IDez2HtK5VKuTT/hE7gDicZ0erN6r1dlix3SpuCtH1MlA=" #U
-    - secure: "kIA09oCHzoHMK4LsfwcaVaMuoAFpd1M+M8tW3b9Rvki/hEB3y46edlb88lWVM7RgkNoCaIPwAZD7Wf3Xiq9Y7wWmqRsWQNRaorC0xke5SuyMwCSQSNo9S5jAu9SM5uxENCH9yucJl/vm2juYitJCHyYYMb4x17fy3sHKULNJ+JBqnrgOuTBYM1JOIkJVO1P5LqEXmqTtr6KgQgiTMtlvnM7hxjapgoyM3J1376f+Kfky0hUoDD7LFLXu8yQCn5Fnar8wR3czK6Qknafmckt5yWJxGOZobMDfKwOdA0fpU+XiArNQ/1NM80fGXq4YOGK5ycVQkO2ACxDqHYfQRYLlIfrUGp75BoXWwN6O1GoOrFcF7ZIoSaLoK3hZdvzRFT7dpUQFlosn00Y7VzqbosQM5QS5TBBqO+DExnkb399OpXI7o0lrlr232kjAeYqEb6N1n3M9BpiNW9Je4plJa/RDKwYsnC8Qak4G08PVTe6V711W1UtqMPd6efWFYTNvRW9tjO3v1lFGaGJ99ABP0AYLIDYWV3zfgvp0UzQOKFdWJj7dMQxdLMQ/bIETKn8P7NFjOWic4pgtp3zekZCL27blhc0fyHm62HUiVLT+VGFOI/nyclzBIZStSVuxPj2LvmAIiMnUNmWwds1ZqIZ21eiNykkn+k52ddTRHXIh2fhvWfg=" #P
+    - IMAGE=fedora26+llvm
 
-stages:
-  - create ghdl/build and ghdl/run images
-  - test
+deploy:
+  provider: releases
+  skip_cleanup: true
+  api_key:
+    secure: ji6LXOmD5V2N+ELHZr4oJsmxPhedk+8W6jfCqQdEbewQ42N+fKOq3lgqJni7ZdfpZaulB9OHPTApv3bwOjXjtN9rfBGmq//U9CwvzHmUeomdQv6WQOVevaWSXl3DNL9fk3yKynyFrsv4pvr45L8GIjaHLggKcYhNFPJ2rrnJlDoFT9MqQNpmP7Bg/LnwVQiv+ZDPkLlMWQzrXzLamdQILARPQka+kCdXl/sHH6OKvLgRvu9yvyXYSSfbyAHP+THISS5gDciizSBeWGlU75kgj/N+mkV+8NvtTTfEIgG8y49WJz6aBooTmRzk/jZW1dKMbDR6c5bpTmRvMZSzeSBuAR6WLhr6HevgCPi/1fX1y3pkVSrgBUF5KcxPgWCZp0I05QjaJOdvQDl1hH4TlVwpT18lM2+cWrui9fS7spnk/AuNKX882C5QWWRy28lIPasCVnwfeKX8a9KAwY9OqVOenoLC1yx7NJOGfH1bjuSYYxyR4XgLiGTHKALAuknCyD9QL0o378IwqxHMcsN0Gsd+GndMu0/b8GvSqfzDpV1XknqabQFwkZLs+Yydw0snfBUzXw9TfOk78IiPYEgXAxsQKBAkK7qvO36HIxLlSQXglXU1D4IDtQYDUel6vKll4pgu0WMxStQCbj51yDVJKvRhzwiBNC6Pwgzt2JTrpwM/T/U=
+  file: "ghdl-*.tgz"
+  file_glob: true
+  on:
+    repo: ghdl/ghdl
+    all_branches: true
+    tags: true
 
 jobs:
   include:
-    # A single job is described in its own stage, to create and push ghdl/build and ghdl/run images.
-    - stage: create ghdl/build and ghdl/run images
-      env: IMAGE=""
-      script: if echo "$TRAVIS_COMMIT_MESSAGE" | grep -F -q "[ci images]"; then ./dist/linux/create.sh; fi;
-      deploy:
-        - <<: *deploy-docker
     # Additional jobs are described in stage 'test' for the macos build.
     # The constraints above are used, except explicitly overriden.
     - &osx
-      stage: test
       os: osx
       language: c
       osx_image: xcode9.3
@@ -79,7 +55,5 @@ jobs:
         directories:
           - gnat
       env: IMAGE=macosx+mcode
-      deploy:
-        - <<: *deploy-releases
 #    - <<: *osx
 #      osx_image: xcode8.3
diff --git a/dist/linux/create.sh b/dist/linux/create.sh
deleted file mode 100644
index aed834fa0..000000000
--- a/dist/linux/create.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-# This script is executed in the travis-ci environment.
-
-set -e
-
-. dist/linux/travis-utils.sh
-. dist/ansi_color.sh
-#disable_color
-
-scriptdir=$(dirname $0)
-
-for d in build run; do
-    currentdir="${scriptdir}/docker/$d"
-    for f in `ls $currentdir`; do
-        for tag in `grep -oP "FROM.*AS \K.*" ${currentdir}/$f`; do
-            echo "travis_fold:start:${f}-$tag"
-            travis_time_start
-            printf "$ANSI_BLUE[DOCKER build] ${d} : ${f} - ${tag}$ANSI_NOCOLOR\n"
-            docker build -t ghdl/${d}:${f}-${tag} --target $tag - < ${currentdir}/$f
-            travis_time_finish
-            echo "travis_fold:end:${f}-$tag"
-        done
-    done
-done
diff --git a/dist/linux/deploy2dockerhub.sh b/dist/linux/deploy2dockerhub.sh
deleted file mode 100755
index 63b9fc8d9..000000000
--- a/dist/linux/deploy2dockerhub.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-
-set -e
-
-. dist/linux/travis-utils.sh
-. dist/ansi_color.sh
-#disable_color
-
-# Skip deploy if we are in stage 0 (i.e. IMAGE="") and there is no '[ci images]' in the commit message
-if [ "$1" = "skip" ] || [ "${1}$(echo $2 | grep -o '\[ci images\]')" = "" ]; then
-    printf "${ANSI_GREEN}SKIP DEPLOY2DOCKERHUB$ANSI_NOCOLOR\n";
-    exit 0;
-fi
-
-case $1 in
-  "")    FILTER="/";;
-  *)     FILTER="/ghdl /pkg";;
-esac
-
-docker login -u="$DOCKER_USER" -p="$DOCKER_PASS"
-for key in $FILTER; do
-  for tag in `echo $(docker images ghdl$key* | awk -F ' ' '{print $1 ":" $2}') | cut -d ' ' -f2-`; do
-      if [ "$tag" = "REPOSITORY:TAG" ]; then break; fi
-      echo "travis_fold:start:`echo $tag | grep -oP 'ghdl/\K.*'`"
-      travis_time_start
-      printf "$ANSI_YELLOW[DOCKER push] ${tag}$ANSI_NOCOLOR\n"
-      docker push $tag
-      travis_time_finish
-      echo "travis_fold:end:`echo $tag | grep -oP 'ghdl/\K.*'`"
-  done
-done
-docker logout
diff --git a/dist/linux/docker/build/buster b/dist/linux/docker/build/buster
deleted file mode 100644
index 776b51485..000000000
--- a/dist/linux/docker/build/buster
+++ /dev/null
@@ -1,11 +0,0 @@
-# [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
deleted file mode 100644
index dfbf99a6c..000000000
--- a/dist/linux/docker/build/fedora26
+++ /dev/null
@@ -1,12 +0,0 @@
-# [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
deleted file mode 100644
index 9803a5619..000000000
--- a/dist/linux/docker/build/stretch
+++ /dev/null
@@ -1,11 +0,0 @@
-# [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
deleted file mode 100644
index 924fd7297..000000000
--- a/dist/linux/docker/build/ubuntu14
+++ /dev/null
@@ -1,16 +0,0 @@
-# [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
deleted file mode 100644
index 308377e19..000000000
--- a/dist/linux/docker/build/ubuntu16
+++ /dev/null
@@ -1,16 +0,0 @@
-# [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
deleted file mode 100644
index ac514a554..000000000
--- a/dist/linux/docker/build/ubuntu18
+++ /dev/null
@@ -1,16 +0,0 @@
-# [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
deleted file mode 100644
index ff5bbf3da..000000000
--- a/dist/linux/docker/run/buster
+++ /dev/null
@@ -1,10 +0,0 @@
-# [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
deleted file mode 100644
index ff0e17bc2..000000000
--- a/dist/linux/docker/run/fedora26
+++ /dev/null
@@ -1,12 +0,0 @@
-# [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
deleted file mode 100644
index 1d42722eb..000000000
--- a/dist/linux/docker/run/stretch
+++ /dev/null
@@ -1,10 +0,0 @@
-# [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
deleted file mode 100644
index 6c72d9c19..000000000
--- a/dist/linux/docker/run/ubuntu14
+++ /dev/null
@@ -1,16 +0,0 @@
-# [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
deleted file mode 100644
index 2bccad554..000000000
--- a/dist/linux/docker/run/ubuntu16
+++ /dev/null
@@ -1,16 +0,0 @@
-# [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
deleted file mode 100644
index 1b2f956ac..000000000
--- a/dist/linux/docker/run/ubuntu18
+++ /dev/null
@@ -1,16 +0,0 @@
-# [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
diff --git a/dist/linux/travis-enc-dockerhub.sh b/dist/linux/travis-enc-dockerhub.sh
deleted file mode 100755
index a677f8039..000000000
--- a/dist/linux/travis-enc-dockerhub.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# - Run `$(command -v winpty) docker run --rm -it alpine sh -c "REPO='https://github.com/<user|organization>/<repo>'; USERNAME=<username>; PASSWORD=<password>; $(cat travis-enc.sh)"`
-# - Check the log and copy the secure key to `.travis.yml`: https://docs.travis-ci.com/user/environment-variables/#Defining-encrypted-variables-in-.travis.yml
-
-apk add -U --no-cache git openssh ruby ruby-dev libffi-dev build-base ruby-dev libc-dev libffi-dev linux-headers
-gem install travis --no-rdoc --no-ri
-
-git clone $REPO ./tmp-repo && cd tmp-repo
-
-travis login --org --auto
-travis encrypt DOCKER_USER=$USERNAME
-travis encrypt DOCKER_PASS=$PASSWORD
diff --git a/dist/linux/build.sh b/dist/travis/build.sh
index 2f0e6c705..297a8561b 100755
--- a/dist/linux/build.sh
+++ b/dist/travis/build.sh
@@ -1,7 +1,9 @@
 #! /bin/bash
 
-. dist/linux/travis-utils.sh
-. dist/ansi_color.sh
+scriptdir=$(dirname $0)
+
+. "$scriptdir/travis-utils.sh"
+. "$scriptdir/../ansi_color.sh"
 disable_color
 
 echo "$0" "$@"
diff --git a/dist/linux/test.sh b/dist/travis/test.sh
index e95bccbb6..c588f01dc 100755
--- a/dist/linux/test.sh
+++ b/dist/travis/test.sh
@@ -1,7 +1,9 @@
 #! /bin/bash
 
-. dist/linux/travis-utils.sh
-. dist/ansi_color.sh
+scriptdir=$(dirname $0)
+
+. "$scriptdir/travis-utils.sh"
+. "$scriptdir/../ansi_color.sh"
 disable_color
 
 echo "$0" "$@"
diff --git a/dist/linux/travis-ci.sh b/dist/travis/travis-ci.sh
index 2585685c8..628acceaf 100755
--- a/dist/linux/travis-ci.sh
+++ b/dist/travis/travis-ci.sh
@@ -23,12 +23,11 @@ build_img_ghdl() {
 
 set -e
 
-. dist/linux/travis-utils.sh
-. dist/ansi_color.sh
-#disable_color
-
 scriptdir=$(dirname $0)
 
+. "$scriptdir/travis-utils.sh"
+. "$scriptdir/../ansi_color.sh"
+#disable_color
 
 # Display env (to debug)
 
diff --git a/dist/linux/travis-utils.sh b/dist/travis/travis-utils.sh
index 8db013f7b..8db013f7b 100644
--- a/dist/linux/travis-utils.sh
+++ b/dist/travis/travis-utils.sh