diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-11-23 19:20:00 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-12-01 08:57:37 -0500 |
| commit | b6108395cb969f79332d4bc31a3996607b9e0c16 (patch) | |
| tree | a0703490f3907ede88189d65de8e14adc5945fb9 /.circleci/images | |
| parent | cbf57b7dbfdbfa72475d793b27858cacf2ed9816 (diff) | |
| download | haskell-b6108395cb969f79332d4bc31a3996607b9e0c16.tar.gz | |
Add GitLab CI
Diffstat (limited to '.circleci/images')
| -rw-r--r-- | .circleci/images/i386-linux/Dockerfile | 5 | ||||
| -rw-r--r-- | .circleci/images/x86_64-freebsd/Dockerfile | 1 | ||||
| -rw-r--r-- | .circleci/images/x86_64-linux-fedora/Dockerfile | 5 | ||||
| -rw-r--r-- | .circleci/images/x86_64-linux/Dockerfile | 5 |
4 files changed, 10 insertions, 6 deletions
diff --git a/.circleci/images/i386-linux/Dockerfile b/.circleci/images/i386-linux/Dockerfile index 47d19cc05b..c8e51810c2 100644 --- a/.circleci/images/i386-linux/Dockerfile +++ b/.circleci/images/i386-linux/Dockerfile @@ -8,8 +8,9 @@ RUN apt-get update -qq # Core build utilities RUN apt-get install -qy zlib1g-dev libtinfo-dev libsqlite3-0 libsqlite3-dev \ - ca-certificates g++ git curl make automake autoconf gcc \ - perl python3 texinfo xz-utils lbzip2 patch openssh-client sudo + ca-certificates g++ git make automake autoconf gcc \ + perl python3 texinfo xz-utils lbzip2 patch openssh-client sudo \ + jq wget curl # Documentation tools RUN apt-get install -qy python3-sphinx texlive-xetex texlive-latex-extra diff --git a/.circleci/images/x86_64-freebsd/Dockerfile b/.circleci/images/x86_64-freebsd/Dockerfile index 9c51cc021c..1098d7a9ac 100644 --- a/.circleci/images/x86_64-freebsd/Dockerfile +++ b/.circleci/images/x86_64-freebsd/Dockerfile @@ -18,6 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ software-properties-common \ sudo \ wget \ + jq \ xz-utils COPY build-toolchain.sh /tmp/ diff --git a/.circleci/images/x86_64-linux-fedora/Dockerfile b/.circleci/images/x86_64-linux-fedora/Dockerfile index 0ed546ca35..6fad77f1c5 100644 --- a/.circleci/images/x86_64-linux-fedora/Dockerfile +++ b/.circleci/images/x86_64-linux-fedora/Dockerfile @@ -5,8 +5,9 @@ ENV LANG C.UTF-8 # Core build utilities RUN dnf -y install coreutils binutils which git make \ automake autoconf gcc perl python3 texinfo xz lbzip2 \ - patch openssh-clients sudo curl zlib-devel sqlite \ - ncurses-compat-libs gmp-devel ncurses-devel gcc-c++ findutils + patch openssh-clients sudo zlib-devel sqlite \ + ncurses-compat-libs gmp-devel ncurses-devel gcc-c++ findutils \ + curl wget jq # Documentation tools RUN dnf -y install python3-sphinx \ diff --git a/.circleci/images/x86_64-linux/Dockerfile b/.circleci/images/x86_64-linux/Dockerfile index 5360645802..0491ad9bba 100644 --- a/.circleci/images/x86_64-linux/Dockerfile +++ b/.circleci/images/x86_64-linux/Dockerfile @@ -8,8 +8,9 @@ RUN apt-get update -qq # Core build utilities RUN apt-get install -qy zlib1g-dev libtinfo-dev libsqlite3-0 libsqlite3-dev \ - ca-certificates g++ git curl make automake autoconf gcc \ - perl python3 texinfo xz-utils lbzip2 patch openssh-client sudo + ca-certificates g++ git make automake autoconf gcc \ + perl python3 texinfo xz-utils lbzip2 patch openssh-client sudo \ + jq wget curl # Documentation tools RUN apt-get install -qy python3-sphinx texlive-xetex texlive-latex-extra |