Auto merge of #4787 - benzcash:ci-builders-libtinfo5, r=str4d
Added libtinfo5 to ci builder containers - Updated apt list for Debian and Ubuntu images. - made the image creation script executable - Fixed `bbworker-buildbot.tac` in Centos Dockerfile This is to support Clang 8 https://github.com/zcash/zcash/pull/4613 You can test it with the images on Docker Hub now something like: ``` docker run --rm -ti --entrypoint bash electriccoinco/zcashd-bbworker-debian9 git clone https://github.com/str4d/zcash.git cd zcash/ git checkout claaaaaang ./zcutil/build.sh -j4 ``` ``` docker run --rm -ti --entrypoint bash electriccoinco/zcashd-bbworker-debian10 git clone https://github.com/str4d/zcash.git cd zcash/ git checkout claaaaaang ./zcutil/build.sh -j4 ``` ``` docker run --rm -ti --entrypoint bash electriccoinco/zcashd-bbworker-ubuntu18.04 git clone https://github.com/str4d/zcash.git cd zcash/ git checkout claaaaaang ./zcutil/build.sh -j4 ``` ``` docker run --rm -ti --entrypoint bash electriccoinco/zcashd-bbworker-ubuntu20.04 git clone https://github.com/str4d/zcash.git cd zcash/ git checkout claaaaaang ./zcutil/build.sh -j4 ``` ``` docker run --rm -ti --entrypoint bash electriccoinco/zcashd-bbworker-centos8 git clone https://github.com/str4d/zcash.git cd zcash/ git checkout claaaaaang ./zcutil/build.sh -j4 ``` ``` docker run --rm -ti --entrypoint bash electriccoinco/zcashd-bbworker-arch git clone https://github.com/str4d/zcash.git cd zcash/ git checkout claaaaaang ./zcutil/build.sh -j4 ```
This commit is contained in:
Homu
commit
1c91003a51
|
|
@ -1,6 +1,6 @@
|
|||
ARG FROMBASEOS
|
||||
ARG FROMBASEOS_BUILD_TAG=latest
|
||||
FROM electriccoinco/zcashd-build:$FROMBASEOS$FROMBASEOS_BUILD_TAG
|
||||
FROM electriccoinco/zcashd-build-$FROMBASEOS$FROMBASEOS_BUILD_TAG
|
||||
|
||||
ARG DUMBINIT_VERSION=1.2.2
|
||||
RUN wget -O /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v${DUMBINIT_VERSION}/dumb-init_${DUMBINIT_VERSION}_amd64
|
||||
|
|
|
|||
|
|
@ -1,17 +1,4 @@
|
|||
ARG ARCHLINUX_TAG=20200205
|
||||
FROM archlinux:$ARCHLINUX_TAG
|
||||
|
||||
RUN pacman -Syyu --noconfirm \
|
||||
&& pacman -S --noconfirm \
|
||||
base-devel \
|
||||
git \
|
||||
python3 \
|
||||
python-pip \
|
||||
wget
|
||||
|
||||
RUN wget -O /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_amd64
|
||||
RUN chmod +x /usr/bin/dumb-init
|
||||
RUN python -m pip install virtualenv
|
||||
FROM electriccoinco/zcashd-build-arch
|
||||
|
||||
# Buildbot user
|
||||
ARG BUILDBOT_USER=zcbbworker
|
||||
|
|
@ -25,15 +12,11 @@ RUN useradd --home-dir /home/$BUILDBOT_USER \
|
|||
USER $BUILDBOT_USER
|
||||
WORKDIR /home/$BUILDBOT_USER
|
||||
|
||||
ADD bbworker-requirements.txt requirements.txt
|
||||
RUN python -m venv venv \
|
||||
&& . venv/bin/activate \
|
||||
&& python -m pip install \
|
||||
buildbot-worker \
|
||||
pyflakes \
|
||||
pyblake2 \
|
||||
pyzmq \
|
||||
requests \
|
||||
twisted[tls]
|
||||
&& python -m pip install wheel \
|
||||
&& python -m pip install -r requirements.txt
|
||||
|
||||
# Buildbot worker
|
||||
ARG BUILDBOT_WORKER_NAME=arch-docker
|
||||
|
|
@ -46,7 +29,7 @@ RUN venv/bin/buildbot-worker create-worker $BUILDBOT_WORKER_NAME \
|
|||
$BUILDBOT_MASTER_HOST:$BUILDBOT_MASTER_PORT \
|
||||
$BUILDBOT_WORKER_NAME $BUILDBOT_WORKER_PASS \
|
||||
&& echo "OS: Centos 8" > $BUILDBOT_WORKER_NAME/info/host
|
||||
ADD buildbot.tac $BUILDBOT_WORKER_NAME/buildbot.tac
|
||||
ADD bbworker-buildbot.tac $BUILDBOT_WORKER_NAME/buildbot.tac
|
||||
|
||||
WORKDIR /home/$BUILDBOT_USER/$BUILDBOT_WORKER_NAME
|
||||
CMD ["/usr/bin/dumb-init", "../venv/bin/twistd", "--pidfile=", "-ny", "buildbot.tac"]
|
||||
|
|
|
|||
|
|
@ -1,16 +1,4 @@
|
|||
FROM centos:8
|
||||
|
||||
RUN yum update -y \
|
||||
&& dnf group install -y "Development Tools" \
|
||||
&& yum install -y \
|
||||
python3 \
|
||||
python3-devel \
|
||||
wget
|
||||
|
||||
RUN wget -O /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_amd64
|
||||
RUN chmod +x /usr/bin/dumb-init
|
||||
RUN alternatives --set python /usr/bin/python3 \
|
||||
&& python3 -m pip install virtualenv
|
||||
FROM electriccoinco/zcashd-build-centos8
|
||||
|
||||
# Buildbot user
|
||||
ARG BUILDBOT_USER=zcbbworker
|
||||
|
|
@ -24,15 +12,11 @@ RUN useradd --home-dir /home/$BUILDBOT_USER \
|
|||
USER $BUILDBOT_USER
|
||||
WORKDIR /home/$BUILDBOT_USER
|
||||
|
||||
ADD bbworker-requirements.txt requirements.txt
|
||||
RUN python3 -m venv venv \
|
||||
&& . venv/bin/activate \
|
||||
&& python3 -m pip install \
|
||||
buildbot-worker \
|
||||
pyflakes \
|
||||
pyblake2 \
|
||||
pyzmq \
|
||||
requests \
|
||||
twisted[tls]
|
||||
&& python -m pip install wheel \
|
||||
&& python -m pip install -r requirements.txt
|
||||
|
||||
# Buildbot worker
|
||||
ARG BUILDBOT_WORKER_NAME=centos8-docker
|
||||
|
|
@ -45,7 +29,7 @@ RUN venv/bin/buildbot-worker create-worker $BUILDBOT_WORKER_NAME \
|
|||
$BUILDBOT_MASTER_HOST:$BUILDBOT_MASTER_PORT \
|
||||
$BUILDBOT_WORKER_NAME $BUILDBOT_WORKER_PASS \
|
||||
&& echo "OS: Centos 8" > $BUILDBOT_WORKER_NAME/info/host
|
||||
ADD buildbot.tac $BUILDBOT_WORKER_NAME/buildbot.tac
|
||||
ADD bbworker-buildbot.tac $BUILDBOT_WORKER_NAME/buildbot.tac
|
||||
|
||||
WORKDIR /home/$BUILDBOT_USER/$BUILDBOT_WORKER_NAME
|
||||
CMD ["/usr/bin/dumb-init", "../venv/bin/twistd", "--pidfile=", "-ny", "buildbot.tac"]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
ARG FROMBASEOS
|
||||
ARG FROMBASEOS_BUILD_TAG
|
||||
FROM $FROMBASEOS:$FROMBASEOS_BUILD_TAG
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
ADD apt-package-list.txt /tmp/apt-package-list.txt
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y $(tr "\n" " " < /tmp/apt-package-list.txt) \
|
||||
&& update-alternatives --install /usr/bin/python python /usr/bin/python3 1
|
||||
|
||||
ARG PYTHONVERSION=3.7.5
|
||||
RUN apt-get install -y \
|
||||
build-essential \
|
||||
zlib1g-dev \
|
||||
libncurses5-dev \
|
||||
libgdbm-dev \
|
||||
libnss3-dev \
|
||||
libssl-dev \
|
||||
libreadline-dev \
|
||||
libffi-dev \
|
||||
curl
|
||||
WORKDIR /tmp
|
||||
RUN curl https://www.python.org/ftp/python/$PYTHONVERSION/Python-$PYTHONVERSION.tar.xz -o python.tar.xz \
|
||||
&& tar -xf python.tar.xz \
|
||||
&& cd Python-$PYTHONVERSION \
|
||||
&& ./configure --enable-optimizations \
|
||||
&& make -j 8 \
|
||||
&& make altinstall \
|
||||
&& update-alternatives --install /usr/bin/python python /usr/local/bin/python3.7 1
|
||||
RUN update-alternatives --install /usr/bin/python3 python3 /usr/local/bin/python3.7 1
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
ARG ARCHLINUX_TAG
|
||||
FROM archlinux:$ARCHLINUX_TAG
|
||||
|
||||
RUN pacman -Syyu --noconfirm \
|
||||
&& pacman -S --noconfirm \
|
||||
base-devel \
|
||||
git \
|
||||
python3 \
|
||||
python-pip \
|
||||
wget
|
||||
|
||||
RUN wget -O /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_amd64
|
||||
RUN chmod +x /usr/bin/dumb-init
|
||||
RUN python -m pip install virtualenv
|
||||
# AUR for libtinfo5 Source: https://dev.to/cloudx/testing-our-package-build-in-the-docker-world-34p0
|
||||
RUN useradd builduser -m \
|
||||
&& passwd -d builduser \
|
||||
&& cd /home/builduser \
|
||||
&& git clone "https://aur.archlinux.org/ncurses5-compat-libs.git" ncurses5-compat-libs \
|
||||
&& chown builduser -R ncurses5-compat-libs \
|
||||
&& (printf 'builduser ALL=(ALL) ALL\n' | tee -a /etc/sudoers) \
|
||||
&& sudo -u builduser bash -c 'gpg --keyserver pool.sks-keyservers.net --recv-keys 702353E0F7E48EDB' \
|
||||
&& sudo -u builduser bash -c 'cd ~/ncurses5-compat-libs && makepkg -si --noconfirm'
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
FROM centos:8
|
||||
|
||||
RUN yum update -y \
|
||||
&& dnf group install -y "Development Tools" \
|
||||
&& yum install -y \
|
||||
ncurses-compat-libs \
|
||||
python3 \
|
||||
python3-devel \
|
||||
wget
|
||||
|
||||
RUN wget -O /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_amd64
|
||||
RUN chmod +x /usr/bin/dumb-init
|
||||
RUN alternatives --set python /usr/bin/python3 \
|
||||
&& python3 -m pip install virtualenv
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
ARG FROMBASEOS
|
||||
ARG FROMBASEOS_BUILD_TAG=latest
|
||||
FROM electriccoinco/zcashd-build:$FROMBASEOS$FROMBASEOS_BUILD_TAG
|
||||
FROM electriccoinco/zcashd-build-$FROMBASEOS$FROMBASEOS_BUILD_TAG
|
||||
|
||||
RUN useradd -ms /bin/bash -U debian
|
||||
USER debian:debian
|
||||
|
|
|
|||
|
|
@ -3,11 +3,17 @@ bsdmainutils
|
|||
build-essential
|
||||
cmake
|
||||
curl
|
||||
g++-aarch64-linux-gnu
|
||||
git
|
||||
lcov
|
||||
libcap-dev
|
||||
libffi-dev
|
||||
libtinfo5
|
||||
libtool
|
||||
libssl-dev
|
||||
libz-dev
|
||||
libbz2-dev
|
||||
mingw-w64
|
||||
pkg-config
|
||||
python3
|
||||
python3-dev
|
||||
|
|
|
|||
|
|
@ -1,37 +1,49 @@
|
|||
# Debian
|
||||
docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=9 -t electriccoinco/zcashd-build:debian9
|
||||
docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=10 -t electriccoinco/zcashd-build:debian10
|
||||
#!/bin/bash
|
||||
set -exo pipefail
|
||||
# Debian 9
|
||||
docker build . -f Dockerfile-build-python.apt --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=9 -t electriccoinco/zcashd-build-debian9
|
||||
docker push electriccoinco/zcashd-build-debian9
|
||||
docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=debian --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=9 -t electriccoinco/zcashd-bbworker-debian9
|
||||
docker push electriccoinco/zcashd-bbworker-debian9
|
||||
|
||||
docker push electriccoinco/zcashd-build:debian9
|
||||
docker push electriccoinco/zcashd-build:debian10
|
||||
# Debian 10
|
||||
docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=10 -t electriccoinco/zcashd-build-debian10
|
||||
docker push electriccoinco/zcashd-build-debian10
|
||||
docker build . -f Dockerfile-gitian.apt --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=10 -t electriccoinco/zcashd-gitian-debian10
|
||||
docker push electriccoinco/zcashd-gitian-debian10
|
||||
docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=debian --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=10 -t electriccoinco/zcashd-bbworker-debian10
|
||||
docker push electriccoinco/zcashd-bbworker-debian10
|
||||
|
||||
docker build . -f Dockerfile-gitian.apt --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=9 -t electriccoinco/zcashd-gitian:debian9
|
||||
docker build . -f Dockerfile-gitian.apt --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=10 -t electriccoinco/zcashd-gitian:debian10
|
||||
# Ubuntu 16.04
|
||||
docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=16.04 -t electriccoinco/zcashd-build-ubuntu1604
|
||||
docker push electriccoinco/zcashd-build-ubuntu1604
|
||||
docker build . -f Dockerfile-gitian.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=1604 -t electriccoinco/zcashd-gitian-ubuntu1604
|
||||
docker push electriccoinco/zcashd-gitian-ubuntu1604
|
||||
docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=ubuntu --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=1604 -t electriccoinco/zcashd-bbworker-ubuntu1604
|
||||
docker push electriccoinco/zcashd-bbworker-ubuntu1604
|
||||
|
||||
docker push electriccoinco/zcashd-gitian:debian9
|
||||
docker push electriccoinco/zcashd-gitian:debian10
|
||||
# Ubuntu 18.04, 20.04
|
||||
docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=18.04 -t electriccoinco/zcashd-build-ubuntu1804
|
||||
docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=20.04 -t electriccoinco/zcashd-build-ubuntu2004
|
||||
docker push electriccoinco/zcashd-build-ubuntu1804
|
||||
docker push electriccoinco/zcashd-build-ubuntu2004
|
||||
docker build . -f Dockerfile-gitian.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=1804 -t electriccoinco/zcashd-gitian-ubuntu1804
|
||||
docker build . -f Dockerfile-gitian.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=2004 -t electriccoinco/zcashd-gitian-ubuntu2004
|
||||
docker push electriccoinco/zcashd-gitian-ubuntu1804
|
||||
docker push electriccoinco/zcashd-gitian-ubuntu2004
|
||||
docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=ubuntu --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=1804 -t electriccoinco/zcashd-bbworker-ubuntu1804
|
||||
docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=ubuntu --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=2004 -t electriccoinco/zcashd-bbworker-ubuntu2004
|
||||
docker push electriccoinco/zcashd-bbworker-ubuntu1804
|
||||
docker push electriccoinco/zcashd-bbworker-ubuntu2004
|
||||
|
||||
docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=debian --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=9 -t electriccoinco/zcashd-bbworker:debian9
|
||||
docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=debian --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=10 -t electriccoinco/zcashd-bbworker:debian10
|
||||
# Centos8
|
||||
docker build . -f Dockerfile-build.centos8 -t electriccoinco/zcashd-build-centos8
|
||||
docker build . -f Dockerfile-bbworker.centos8 -t electriccoinco/zcashd-bbworker-centos8
|
||||
docker push electriccoinco/zcashd-build-centos8
|
||||
docker push electriccoinco/zcashd-bbworker-centos8
|
||||
|
||||
docker push electriccoinco/zcashd-bbworker:debian9
|
||||
docker push electriccoinco/zcashd-bbworker:debian10
|
||||
|
||||
# Ubuntu
|
||||
docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=18.04 -t electriccoinco/zcashd-build:ubuntu18.04
|
||||
docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=20.04 -t electriccoinco/zcashd-build:ubuntu20.04
|
||||
|
||||
docker push electriccoinco/zcashd-build:ubuntu18.04
|
||||
docker push electriccoinco/zcashd-build:ubuntu20.04
|
||||
|
||||
docker build . -f Dockerfile-gitian.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=18.04 -t electriccoinco/zcashd-gitian:ubuntu18.04
|
||||
docker build . -f Dockerfile-gitian.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=20.04 -t electriccoinco/zcashd-gitian:ubuntu20.04
|
||||
|
||||
docker push electriccoinco/zcashd-gitian:ubuntu18.04
|
||||
docker push electriccoinco/zcashd-gitian:ubuntu20.04
|
||||
|
||||
docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=ubuntu --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=18.04 -t electriccoinco/zcashd-bbworker:ubuntu18.04
|
||||
docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=ubuntu --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=20.04 -t electriccoinco/zcashd-bbworker:ubuntu20.04
|
||||
|
||||
docker push electriccoinco/zcashd-bbworker:ubuntu18.04
|
||||
docker push electriccoinco/zcashd-bbworker:ubuntu20.04
|
||||
# Arch 20200908
|
||||
docker build . -f Dockerfile-build.arch --build-arg ARCHLINUX_TAG=20200908 -t electriccoinco/zcashd-build-arch
|
||||
docker build . -f Dockerfile-bbworker.arch -t electriccoinco/zcashd-bbworker-arch
|
||||
docker push electriccoinco/zcashd-build-arch
|
||||
docker push electriccoinco/zcashd-bbworker-arch
|
||||
Loading…
Reference in New Issue