From 3e81cd16bbb15f7e3bd18e6bb3cdba1182fde78c Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Sat, 31 Oct 2020 22:02:42 +0300 Subject: [PATCH] update for docker --- .docker/Dockerfile-ubuntu-amd64 | 2 +- .docker/Dockerfile-ubuntu-i386 | 2 +- .docker/build-ubuntu-package.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.docker/Dockerfile-ubuntu-amd64 b/.docker/Dockerfile-ubuntu-amd64 index 0484b44..4b955a9 100644 --- a/.docker/Dockerfile-ubuntu-amd64 +++ b/.docker/Dockerfile-ubuntu-amd64 @@ -1,4 +1,4 @@ -FROM multiarch/ubuntu-core:amd64-xenial +FROM ubuntu:bionic RUN apt-get update # toolchain diff --git a/.docker/Dockerfile-ubuntu-i386 b/.docker/Dockerfile-ubuntu-i386 index 4fa8923..a88060d 100644 --- a/.docker/Dockerfile-ubuntu-i386 +++ b/.docker/Dockerfile-ubuntu-i386 @@ -1,4 +1,4 @@ -FROM multiarch/ubuntu-core:i386-xenial +FROM multiarch/ubuntu-core:i386-bionic RUN apt-get update # toolchain diff --git a/.docker/build-ubuntu-package.sh b/.docker/build-ubuntu-package.sh index a0427fa..8cf2372 100755 --- a/.docker/build-ubuntu-package.sh +++ b/.docker/build-ubuntu-package.sh @@ -6,8 +6,8 @@ rm -rf build-ubuntu mkdir build-ubuntu # patches -git apply patches/qt5.6-qversionnumber.patch -git apply patches/qt5.5-qstringlist-and-qinfo.patch +#git apply patches/qt5.6-qversionnumber.patch +#git apply patches/qt5.5-qstringlist-and-qinfo.patch # build cd build-ubuntu