From 400f1ecea360a7d7cc1862fec19f527b406e16df Mon Sep 17 00:00:00 2001 From: Keith Hughitt Date: Thu, 25 Apr 2019 15:18:47 -0400 Subject: [PATCH 1/6] Added Arch Linux builders. --- arch/Dockerfile | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ jenkins.sh | 4 +++ 2 files changed, 70 insertions(+) create mode 100644 arch/Dockerfile diff --git a/arch/Dockerfile b/arch/Dockerfile new file mode 100644 index 0000000..5d1b41b --- /dev/null +++ b/arch/Dockerfile @@ -0,0 +1,66 @@ +## Emacs, make this -*- mode: sh; -*- + +FROM archlinux/base:latest + +## Set a default user. Available via runtime flag +RUN useradd docker + +RUN pacman -Syu --noconfirm + +# installed in archlinux:base -- +# ca-certificates curl bzip2 findutils pcre readline xz zlib +RUN pacman -S --noconfirm \ + gcc-fortran \ + less \ + jdk8-openjdk \ + cairo \ + ghostscript \ + icu \ + libjpeg-turbo \ + pango \ + libpng \ + libtiff \ + libx11 \ + libxmu \ + libxt \ + make \ + subversion \ + tcl \ + texinfo \ + texlive-core \ + texlive-fontsextra \ + tk \ + unzip \ + xorgproto \ + tar \ + which \ + xorg-server-xvfb + + +RUN pacman -S --noconfirm valgrind + +RUN pacman -S --noconfirm qpdf + +#RUN curl -o /usr/bin/pandoc.gz \ +# https://files.r-hub.io/pandoc/linux-64/pandoc.gz && \ +# gzip -d /usr/bin/pandoc.gz && \ +# curl -o /usr/bin/pandoc-citeproc.gz \ +# https://files.r-hub.io/pandoc/linux-64/pandoc-citeproc.gz && \ +# gzip -d /usr/bin/pandoc-citeproc.gz && \ +# chmod +x /usr/bin/pandoc /usr/bin/pandoc-citeproc + +RUN pacman -S --noconfirm pandoc pandoc-citeproc + +RUN pacman -S --noconfirm aspell aspell-en + +RUN pacman -S --noconfirm file + +RUN pacman -S --noconfirm xorg-fonts-100dpi xorg-fonts-75dpi + +RUN sed -i '/^#en_US.UTF-8/ s/^#//' /etc/locale.gen +RUN locale-gen +RUN echo LANG=en_US.UTF-8 > /etc/locale.conf + +ENV LC_ALL en_US.UTF-8 +ENV LANG en_US.UTF-8 + diff --git a/jenkins.sh b/jenkins.sh index 8bad7d0..fc82c22 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -13,6 +13,10 @@ docker ps -a | grep 'Exited' | awk ' { print $1; } ' | xargs docker rm || true # done manually, as needed. failed=0 +./build-image.sh arch || failed=1 +./build-image.sh arch-gcc || failed=1 +./build-image.sh arch-clang || failed=1 + ./build-image.sh debian || failed=1 ./build-image.sh debian-gcc || failed=1 ./build-image.sh debian-gcc-devel --no-cache || failed=1 From 0030271d90a593f77bc4beae53d788644636ad30 Mon Sep 17 00:00:00 2001 From: Keith Hughitt Date: Mon, 29 Apr 2019 19:50:32 -0400 Subject: [PATCH 2/6] Added arch-gcc and arch-clang Dockerfiles --- arch-clang/Dockerfile | 10 ++++++++++ arch-gcc/Dockerfile | 7 +++++++ 2 files changed, 17 insertions(+) create mode 100644 arch-clang/Dockerfile create mode 100644 arch-gcc/Dockerfile diff --git a/arch-clang/Dockerfile b/arch-clang/Dockerfile new file mode 100644 index 0000000..101d50b --- /dev/null +++ b/arch-clang/Dockerfile @@ -0,0 +1,10 @@ +## Emacs, make this -*- mode: sh; -*- + +FROM archlinux/base:latest + +RUN pacman -Syu --noconfirm + +RUN pacman -S --noconfirm \ + clang \ + llvm-libs \ + compiler-rt diff --git a/arch-gcc/Dockerfile b/arch-gcc/Dockerfile new file mode 100644 index 0000000..d7139bb --- /dev/null +++ b/arch-gcc/Dockerfile @@ -0,0 +1,7 @@ +## Emacs, make this -*- mode: sh; -*- + +FROM archlinux/base:latest + +RUN pacman -Syu --noconfirm + +RUN pacman -S --noconfirm gcc From d243b5491795b5bd7d424e4a09903159bd897a73 Mon Sep 17 00:00:00 2001 From: Keith Hughitt Date: Mon, 29 Apr 2019 19:53:42 -0400 Subject: [PATCH 3/6] Add R to base Arch Linux Dockerfile --- arch/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/Dockerfile b/arch/Dockerfile index 5d1b41b..913b39f 100644 --- a/arch/Dockerfile +++ b/arch/Dockerfile @@ -24,6 +24,7 @@ RUN pacman -S --noconfirm \ libxmu \ libxt \ make \ + r \ subversion \ tcl \ texinfo \ From 7ad64321e459b7c5d2a45e8dc2a82e77e5a97030 Mon Sep 17 00:00:00 2001 From: Keith Hughitt Date: Mon, 29 Apr 2019 19:54:58 -0400 Subject: [PATCH 4/6] Changed version of pandoc/pandoc-citeproc used by Arch Dockerfile --- arch/Dockerfile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/arch/Dockerfile b/arch/Dockerfile index 913b39f..6469c60 100644 --- a/arch/Dockerfile +++ b/arch/Dockerfile @@ -42,15 +42,17 @@ RUN pacman -S --noconfirm valgrind RUN pacman -S --noconfirm qpdf -#RUN curl -o /usr/bin/pandoc.gz \ -# https://files.r-hub.io/pandoc/linux-64/pandoc.gz && \ -# gzip -d /usr/bin/pandoc.gz && \ -# curl -o /usr/bin/pandoc-citeproc.gz \ -# https://files.r-hub.io/pandoc/linux-64/pandoc-citeproc.gz && \ -# gzip -d /usr/bin/pandoc-citeproc.gz && \ -# chmod +x /usr/bin/pandoc /usr/bin/pandoc-citeproc +# to be consistent with other builders, use the version of pandoc +# hosted on r-hub.io +RUN curl -o /usr/bin/pandoc.gz \ + https://files.r-hub.io/pandoc/linux-64/pandoc.gz && \ + gzip -d /usr/bin/pandoc.gz && \ + curl -o /usr/bin/pandoc-citeproc.gz \ + https://files.r-hub.io/pandoc/linux-64/pandoc-citeproc.gz && \ + gzip -d /usr/bin/pandoc-citeproc.gz && \ + chmod +x /usr/bin/pandoc /usr/bin/pandoc-citeproc -RUN pacman -S --noconfirm pandoc pandoc-citeproc +# RUN pacman -S --noconfirm pandoc pandoc-citeproc RUN pacman -S --noconfirm aspell aspell-en From 94572a09945ddaca4f97b33d9c9a6e03e892c7fb Mon Sep 17 00:00:00 2001 From: Keith Hughitt Date: Wed, 1 May 2019 07:18:21 -0400 Subject: [PATCH 5/6] Removed unneccessary arch images; updated README.md to include arch. --- README.md | 1 + arch-clang/Dockerfile | 10 ---------- arch-gcc/Dockerfile | 7 ------- jenkins.sh | 2 -- 4 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 arch-clang/Dockerfile delete mode 100644 arch-gcc/Dockerfile diff --git a/README.md b/README.md index f9b459e..c867974 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ Most subfolders correspond to a **platform configuration**, e.g. [debian-gcc-rel image | description | size | metrics | build status ---------------- | ----------------------------------------- | ------ | ------- | -------------- +[arch](https://hub.docker.com/r/rhub/arch) | Arch Linux, R-release, GCC | [![](https://images.microbadger.com/badges/image/rhub/arch.svg)](https://microbadger.com/images/rhub/arch) | [![](https://img.shields.io/docker/pulls/rhub/arch.svg)](https://hub.docker.com/r/rhub/arch) | [![](https://img.shields.io/docker/cloud/build/rhub/arch.svg)](https://hub.docker.com/r/rhub/arch/builds) [debian-gcc-devel](https://hub.docker.com/r/rhub/debian-gcc-devel) | Debian Linux, R-devel, GCC | [![](https://images.microbadger.com/badges/image/rhub/debian-gcc-devel.svg)](https://microbadger.com/images/rhub/debian-gcc-devel) | [![](https://img.shields.io/docker/pulls/rhub/debian-gcc-devel.svg)](https://hub.docker.com/r/rhub/debian-gcc-devel) | [![](https://img.shields.io/docker/cloud/build/rhub/debian-gcc-devel.svg)](https://hub.docker.com/r/rhub/debian-gcc-devel/builds) [debian-gcc-patched](https://hub.docker.com/r/rhub/debian-gcc-patched) | Debian Linux, R-patched, GCC | [![](https://images.microbadger.com/badges/image/rhub/debian-gcc-patched.svg)](https://microbadger.com/images/rhub/debian-gcc-patched) | [![](https://img.shields.io/docker/pulls/rhub/debian-gcc-patched.svg)](https://hub.docker.com/r/rhub/debian-gcc-patched) | [![](https://img.shields.io/docker/cloud/build/rhub/debian-gcc-patched.svg)](https://hub.docker.com/r/rhub/debian-gcc-patched/builds) [debian-gcc-release](https://hub.docker.com/r/rhub/debian-gcc-release) | Debian Linux, R-release, GCC | [![](https://images.microbadger.com/badges/image/rhub/debian-gcc-release.svg)](https://microbadger.com/images/rhub/debian-gcc-release) | [![](https://img.shields.io/docker/pulls/rhub/debian-gcc-release.svg)](https://hub.docker.com/r/rhub/debian-gcc-release) | [![](https://img.shields.io/docker/cloud/build/rhub/debian-gcc-release.svg)](https://hub.docker.com/r/rhub/debian-gcc-release/builds) diff --git a/arch-clang/Dockerfile b/arch-clang/Dockerfile deleted file mode 100644 index 101d50b..0000000 --- a/arch-clang/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -## Emacs, make this -*- mode: sh; -*- - -FROM archlinux/base:latest - -RUN pacman -Syu --noconfirm - -RUN pacman -S --noconfirm \ - clang \ - llvm-libs \ - compiler-rt diff --git a/arch-gcc/Dockerfile b/arch-gcc/Dockerfile deleted file mode 100644 index d7139bb..0000000 --- a/arch-gcc/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -## Emacs, make this -*- mode: sh; -*- - -FROM archlinux/base:latest - -RUN pacman -Syu --noconfirm - -RUN pacman -S --noconfirm gcc diff --git a/jenkins.sh b/jenkins.sh index fc82c22..2d387ba 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -14,8 +14,6 @@ docker ps -a | grep 'Exited' | awk ' { print $1; } ' | xargs docker rm || true failed=0 ./build-image.sh arch || failed=1 -./build-image.sh arch-gcc || failed=1 -./build-image.sh arch-clang || failed=1 ./build-image.sh debian || failed=1 ./build-image.sh debian-gcc || failed=1 From 294585b74a391a5e3a192ea013ca8503ff6647dc Mon Sep 17 00:00:00 2001 From: Keith Hughitt Date: Wed, 1 May 2019 09:46:25 -0400 Subject: [PATCH 6/6] Update arch Dockerfile to specify sysreqs platform --- arch/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/Dockerfile b/arch/Dockerfile index 6469c60..246e8b5 100644 --- a/arch/Dockerfile +++ b/arch/Dockerfile @@ -64,6 +64,8 @@ RUN sed -i '/^#en_US.UTF-8/ s/^#//' /etc/locale.gen RUN locale-gen RUN echo LANG=en_US.UTF-8 > /etc/locale.conf +ENV RHUB_PLATFORM linux-x86_64-arch + ENV LC_ALL en_US.UTF-8 ENV LANG en_US.UTF-8