From 09aed5bf41e46f1a1cc2b7ebe13941ad94b606a9 Mon Sep 17 00:00:00 2001
From: Marcin Sobczyk <msobczyk@syncad.com>
Date: Mon, 21 Nov 2022 09:58:40 +0100
Subject: [PATCH] add ncat and docker.io to ci_base_image for hived

---
 Dockerfile                                | 19 ++++++++++++++++++-
 scripts/ci-helpers/build_ci_base_image.sh | 11 ++++++++++-
 scripts/setup_ubuntu.sh                   |  2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 637f26d2b..86ca2692f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 # Modify CI_IMAGE_TAG here and inside script hive/scripts/ci-helpers/build_ci_base_images.sh and run it. Then push images to registry
 # To be started from cloned haf source directory.
 ARG CI_REGISTRY_IMAGE=registry.gitlab.syncad.com/hive/hive/
-ARG CI_IMAGE_TAG=:ubuntu20.04-5 
+ARG CI_IMAGE_TAG=:ubuntu20.04-6
 ARG BUILD_IMAGE_TAG
 
 FROM phusion/baseimage:focal-1.0.0 AS runtime
@@ -133,6 +133,23 @@ EXPOSE ${CLI_WALLET_PORT}
 
 FROM ${CI_REGISTRY_IMAGE}ci-base-image-5m$CI_IMAGE_TAG AS block_log_5m_source
 
+FROM ${CI_REGISTRY_IMAGE}ci-base-image-5m$CI_IMAGE_TAG AS convert_block_log
+
+COPY --from=build \
+  /home/hived/build/programs/blockchain_converter/blockchain_converter \
+  /home/hived/bin/
+
+RUN mkdir /home/hived/converted_blockchain
+
+RUN /home/hived/bin/blockchain_converter --plugin block_log_conversion \
+  --input /home/hived/datadir/blockchain/block_log \
+  --output /home/hived/converted_blockchain/block_log \
+  --chain-id 1 --private-key 5JNHfZYKGaomSFvd4NUdQ9qMcEAC43kujbfjueTHpVapX1Kzq2n --use-same-key --jobs 2
+
+FROM ${CI_REGISTRY_IMAGE}ci-base-image$CI_IMAGE_TAG AS block_log_mirrornet_5m_source
+
+COPY --from=convert_block_log /home/hived/converted_blockchain/block_log /home/hived/datadir/blockchain/block_log
+
 FROM ${CI_REGISTRY_IMAGE}base_instance:base_instance-$BUILD_IMAGE_TAG as data
 
 COPY --from=block_log_5m_source /home/hived/datadir /home/hived/datadir 
diff --git a/scripts/ci-helpers/build_ci_base_image.sh b/scripts/ci-helpers/build_ci_base_image.sh
index 46763255b..257e54fd2 100755
--- a/scripts/ci-helpers/build_ci_base_image.sh
+++ b/scripts/ci-helpers/build_ci_base_image.sh
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 REGISTRY=${1:-registry.gitlab.syncad.com/hive/hive/}
-CI_IMAGE_TAG=:ubuntu20.04-5
+CI_IMAGE_TAG=:ubuntu20.04-6
 
 export DOCKER_BUILDKIT=1
 
@@ -17,3 +17,12 @@ docker build --target=ci-base-image \
 docker build --target=ci-base-image-5m \
   --build-arg CI_REGISTRY_IMAGE=$REGISTRY --build-arg CI_IMAGE_TAG=$CI_IMAGE_TAG \
   -t ${REGISTRY}ci-base-image-5m$CI_IMAGE_TAG -f Dockerfile .
+
+docker build --target=block_log_5m_source \
+  --build-arg CI_REGISTRY_IMAGE=$REGISTRY --build-arg CI_IMAGE_TAG=$CI_IMAGE_TAG \
+  -t ${REGISTRY}block_log_5m_source$CI_IMAGE_TAG -f Dockerfile .
+
+docker build --target=block_log_mirrornet_5m_source \
+  --build-arg CI_REGISTRY_IMAGE=$REGISTRY --build-arg CI_IMAGE_TAG=$CI_IMAGE_TAG \
+  --build-arg BUILD_HIVE_TESTNET=OFF --build-arg HIVE_CONVERTER_BUILD=ON \
+  -t ${REGISTRY}block_log_mirrornet_5m_source$CI_IMAGE_TAG -f Dockerfile .
diff --git a/scripts/setup_ubuntu.sh b/scripts/setup_ubuntu.sh
index 4a83ff6fa..8cebb5f86 100755
--- a/scripts/setup_ubuntu.sh
+++ b/scripts/setup_ubuntu.sh
@@ -41,7 +41,7 @@ install_all_dev_packages() {
   apt-get update && apt-get install -y \
   git python3 build-essential gir1.2-glib-2.0 libgirepository-1.0-1 libglib2.0-0 libglib2.0-data libxml2 python3-distutils python3-lib2to3 python3-pkg-resources shared-mime-info xdg-user-dirs ca-certificates \
   autoconf automake cmake clang clang-tidy g++ git libbz2-dev libsnappy-dev libssl-dev libtool make pkg-config python3-jinja2 libboost-all-dev doxygen libncurses5-dev libreadline-dev perl ninja-build \
-  xxd \
+  xxd ncat \
   \
   screen python3-pip python3-dateutil tzdata python3-junit.xml python3-venv python3-dateutil \
   python3-dev \
-- 
GitLab