From 4bb3d492e53bccc5ab89f4399dff1dd45b1e7802 Mon Sep 17 00:00:00 2001 From: mdr0id Date: Wed, 21 Apr 2021 10:35:45 -0700 Subject: [PATCH 1/2] Add Debian 11 ci-builder --- contrib/ci-builders/docker-build.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/contrib/ci-builders/docker-build.sh b/contrib/ci-builders/docker-build.sh index 58af6de30..867a2d3ca 100755 --- a/contrib/ci-builders/docker-build.sh +++ b/contrib/ci-builders/docker-build.sh @@ -17,6 +17,14 @@ 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 +# Debian 11 +docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=bullseye -t electriccoinco/zcashd-build-debian11 +docker push electriccoinco/zcashd-build-debian11 +docker build . -f Dockerfile-gitian.apt --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=bullseye -t electriccoinco/zcashd-gitian-debian11 +docker push electriccoinco/zcashd-gitian-debian11 +docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=debian --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=bullseye -t electriccoinco/zcashd-bbworker-debian11 +docker push electriccoinco/zcashd-bbworker-debian11 + # 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 From cb756bf72572529a907c7fe3ed652f2d8bc29c5a Mon Sep 17 00:00:00 2001 From: mdr0id Date: Wed, 21 Apr 2021 10:39:45 -0700 Subject: [PATCH 2/2] clean up ubuntu 18.04 and 20.04 commands --- contrib/ci-builders/docker-build.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/contrib/ci-builders/docker-build.sh b/contrib/ci-builders/docker-build.sh index 867a2d3ca..fb806e8dc 100755 --- a/contrib/ci-builders/docker-build.sh +++ b/contrib/ci-builders/docker-build.sh @@ -33,18 +33,20 @@ 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 -# Ubuntu 18.04, 20.04 +# Ubuntu 18.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 + +# Ubuntu 20.04 +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-ubuntu2004 +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-ubuntu2004 +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-ubuntu2004 # Centos8