From c9e052fe581cdd65ee7a05584288673e902110e0 Mon Sep 17 00:00:00 2001
From: Colin LeMahieu <clemahieu@gmail.com>
Date: Mon, 6 Mar 2023 11:17:05 +0000
Subject: [PATCH 1/2] Updating flatbuffer library version.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The file nano/ipc_flatbuffers_lib/generated/flatbuffers/nanoapi_generated.h will need to be regenerated by deleting the file and rebuilding.

An error like: error: no matching function for call to ‘nanoapi::Envelope::VerifyField<uint8_t> indicates the file has not been regenerated.

Adding -DNOGDI flag for WIN32 to prevent the ERROR macro within wingdi.h from colliding with ProtoIdGapAction::ERROR
---
 CMakeLists.txt         | 2 +-
 submodules/flatbuffers | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 689f62fc6..22a423e58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,7 +215,7 @@ find_package(Threads)
 if(WIN32)
   find_library(PSAPI Psapi)
   add_definitions(-D_WIN32_WINNT=0x0600 -DWINVER=0x0600 -DMINIUPNP_STATICLIB
-                  -D_CRT_SECURE_NO_WARNINGS /EHsc)
+                  -D_CRT_SECURE_NO_WARNINGS -DNOGDI /EHsc)
 
   if(${USING_TSAN}
      OR ${USING_ASAN}
diff --git a/submodules/flatbuffers b/submodules/flatbuffers
index a9a295fec..01834de25 160000
--- a/submodules/flatbuffers
+++ b/submodules/flatbuffers
@@ -1 +1 @@
-Subproject commit a9a295fecf3fbd5a4f571f53b01f63202a3e2113
+Subproject commit 01834de25e4bf3975a9a00e816292b1ad0fe184b

From df1416db1f8ee20bee01bb977dba8b4d554f7997 Mon Sep 17 00:00:00 2001
From: Thiago Silva <thiago@nano.org>
Date: Mon, 6 Mar 2023 14:36:12 -0300
Subject: [PATCH 2/2] Bump docker image Ubuntu version to 22.04 Remove -k
 option, that doesn't exist for cmake.

---
 ci/build-ci.sh            | 2 +-
 docker/ci/Dockerfile-base | 9 ++++++---
 docker/ci/Dockerfile-gcc  | 3 ---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ci/build-ci.sh b/ci/build-ci.sh
index 74f2342dd..16ff8deb3 100755
--- a/ci/build-ci.sh
+++ b/ci/build-ci.sh
@@ -60,7 +60,7 @@ if [[ "$OS" == 'Linux' ]]; then
     if [[ ${LCOV:-0} == 1 ]]; then
         cmake --build ${PWD} --target generate_coverage -- -j2
     else
-        cmake --build ${PWD} --target ${build_target} -k -- -j2
+        cmake --build ${PWD} --target ${build_target} -- -j2
     fi
 else
     sudo cmake --build ${PWD} --target ${build_target} -- -j2
diff --git a/docker/ci/Dockerfile-base b/docker/ci/Dockerfile-base
index 1feccdee4..bf9f14085 100644
--- a/docker/ci/Dockerfile-base
+++ b/docker/ci/Dockerfile-base
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -6,13 +6,16 @@ RUN apt-get update -qq && apt-get install -yqq \
 build-essential \
 g++ \
 wget \
-python \
+python3 \
 zlib1g-dev \
 cmake \
 git
 
 RUN apt-get update -qq && apt-get install -yqq \
-qt5-default \
+qtbase5-dev \
+qtchooser \
+qt5-qmake \
+qtbase5-dev-tools \
 valgrind \
 xorg xvfb xauth xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic
 
diff --git a/docker/ci/Dockerfile-gcc b/docker/ci/Dockerfile-gcc
index 992f710ab..eaa7466e0 100644
--- a/docker/ci/Dockerfile-gcc
+++ b/docker/ci/Dockerfile-gcc
@@ -1,8 +1,5 @@
 ARG ENV_REPOSITORY=nanocurrency/nano-env
 FROM ${ENV_REPOSITORY}:base
 
-RUN apt-get update -qq && apt-get install -yqq \
-..
-
 ARG REPOSITORY=nanocurrency/nano-node
 LABEL org.opencontainers.image.source https://github.com/$REPOSITORY