diff --git a/contrib/gitian/dockrun.sh b/contrib/gitian/dockrun.sh index f24e783b7..816454bf0 100755 --- a/contrib/gitian/dockrun.sh +++ b/contrib/gitian/dockrun.sh @@ -17,8 +17,8 @@ fi GH_USER=${GH_USER-$USER} -TAG=gitrun-focal -TAG2=base-focal-amd64 +TAG=gitrun-bionic +TAG2=base-bionic-amd64 IMAGE=`docker images | grep $TAG` WORKDIR=/home/ubuntu @@ -30,7 +30,7 @@ cd docker # container for running gitian-build.py cat < ${TAG}.Dockerfile -FROM ubuntu:focal +FROM ubuntu:bionic ENV DEBIAN_FRONTEND=noninteractive RUN echo 'Acquire::http { Proxy "http://172.17.0.1:3142"; };' > /etc/apt/apt.conf.d/50cacher @@ -63,7 +63,7 @@ cd docker # container for actually running each build cat < ${TAG2}.Dockerfile -FROM ubuntu:focal +FROM ubuntu:bionic ENV DEBIAN_FRONTEND=noninteractive RUN echo 'Acquire::http { Proxy "http://172.17.0.1:3142"; };' > /etc/apt/apt.conf.d/50cacher diff --git a/contrib/gitian/gitian-android.yml b/contrib/gitian/gitian-android.yml index cf953d87c..4007967f5 100644 --- a/contrib/gitian/gitian-android.yml +++ b/contrib/gitian/gitian-android.yml @@ -2,7 +2,7 @@ name: "wownero-android-0.11" enable_cache: true suites: -- "focal" +- "bionic" architectures: - "amd64" packages: diff --git a/contrib/gitian/gitian-build.py b/contrib/gitian/gitian-build.py index 35d3085fe..b02285ebc 100755 --- a/contrib/gitian/gitian-build.py +++ b/contrib/gitian/gitian-build.py @@ -36,7 +36,7 @@ def setup(): subprocess.check_call(['rm', 'wownero', '-fR']) subprocess.check_call(['git', 'clone', args.url, 'wownero']) os.chdir('..') - make_image_prog = ['bin/make-base-vm', '--suite', 'focal', '--arch', 'amd64'] + make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64'] if args.docker: try: subprocess.check_output(['docker', '--help']) @@ -48,7 +48,7 @@ def setup(): make_image_prog += ['--lxc'] subprocess.check_call(make_image_prog) os.chdir(workdir) - if args.is_focal and not args.kvm and not args.docker: + if args.is_bionic and not args.kvm and not args.docker: subprocess.check_call(['sudo', 'sed', '-i', 's/lxcbr0/br0/', '/etc/default/lxc-net']) print('Reboot is required') sys.exit(0) @@ -134,7 +134,7 @@ def main(): args = parser.parse_args() workdir = os.getcwd() - args.is_focal = b'focal' in subprocess.check_output(['lsb_release', '-cs']) + args.is_bionic = b'bionic' in subprocess.check_output(['lsb_release', '-cs']) if args.buildsign: args.build = True diff --git a/contrib/gitian/gitian-freebsd.yml b/contrib/gitian/gitian-freebsd.yml index eed9379cb..cb67be573 100644 --- a/contrib/gitian/gitian-freebsd.yml +++ b/contrib/gitian/gitian-freebsd.yml @@ -2,7 +2,7 @@ name: "wownero-freebsd-0.11" enable_cache: true suites: -- "focal" +- "bionic" architectures: - "amd64" packages: diff --git a/contrib/gitian/gitian-linux.yml b/contrib/gitian/gitian-linux.yml index 2b8371ba3..e151dd499 100644 --- a/contrib/gitian/gitian-linux.yml +++ b/contrib/gitian/gitian-linux.yml @@ -2,7 +2,7 @@ name: "wownero-linux-0.11" enable_cache: true suites: -- "focal" +- "bionic" architectures: - "amd64" packages: diff --git a/contrib/gitian/gitian-osx.yml b/contrib/gitian/gitian-osx.yml index d26be2c93..8b31e73ab 100644 --- a/contrib/gitian/gitian-osx.yml +++ b/contrib/gitian/gitian-osx.yml @@ -2,7 +2,7 @@ name: "wownero-osx-0.11" enable_cache: true suites: -- "focal" +- "bionic" architectures: - "amd64" packages: diff --git a/contrib/gitian/gitian-win.yml b/contrib/gitian/gitian-win.yml index d47dfe6b5..41116999a 100644 --- a/contrib/gitian/gitian-win.yml +++ b/contrib/gitian/gitian-win.yml @@ -2,7 +2,7 @@ name: "wownero-win-0.11" enable_cache: true suites: -- "focal" +- "bionic" architectures: - "amd64" packages: