Install ADCC-extension dependencies in Dockerfile

arenadata/Dockerfile

@@ -31,7 +31,7 @@ RUN yum makecache && \
     yum -y install openssl-devel pam-devel readline-devel snappy-devel libuv-devel && \
     yum -y install libicu perl-ExtUtils-Embed perl-Env perl-JSON && \
     yum -y install perl-IPC-Run perl-Test-Base libxslt-devel && \
-    yum -y install libzstd-static && \
+    yum -y install libzstd-static protobuf-c protobuf-compiler python-protobuf && \
     # Installing the latest version of pip available for python 2.7 (20.3.4).
     # The installation goes through a bootstrap script since pip from the
     # repository can no longer update itself.
@@ -88,7 +88,7 @@ RUN mkdir /home/gpadmin/bin_gpdb
 ENV TARGET_OS_VERSION=7
 ENV TARGET_OS=centos
 ENV OUTPUT_ARTIFACT_DIR=bin_gpdb
-ENV CONFIGURE_FLAGS="--enable-debug-extensions --with-gssapi --enable-cassert --enable-debug --enable-depend" 
+ENV CONFIGURE_FLAGS="--enable-debug-extensions --with-gssapi --enable-cassert --enable-debug --enable-depend"
 
 # Compile with running mocking tests
 RUN bash /home/gpadmin/gpdb_src/concourse/scripts/compile_gpdb.bash

arenadata/Dockerfile.ubuntu

@@ -23,10 +23,19 @@ RUN set -eux; \
 # Alter precedence in favor of IPv4 during resolving
     echo 'precedence ::ffff:0:0/96  100' >> /etc/gai.conf; \
 # Packages for tests
-    DEBIAN_FRONTEND=noninteractive apt install -y krb5-kdc krb5-admin-server fakeroot sudo python-pip openjdk-11-jdk; \
+    DEBIAN_FRONTEND=noninteractive \
+        apt install -y krb5-kdc krb5-admin-server fakeroot sudo python-pip \
+            openjdk-11-jdk protobuf-compiler; \
 # Install allure-behave for behave tests
     pip2 install allure-behave==2.4.0; \
-    pip2 cache purge
+    pip2 cache purge; \
+# Use ADB's python3.9 over Ubuntu-provided 3.10
+    ln -s /opt/adb6-python3.9/bin/* -t /usr/local/bin/; \
+# Fix pip3's broken symlink. Do this after linking as to now overwrite python2
+    ln -s /opt/adb6-python3.9/bin/python3 /opt/adb6-python3.9/bin/python; \
+# Protobuf for ADCC-extension
+    pip3 install protobuf==3.20.0; \
+    pip3 cache purge
 
 WORKDIR /home/gpadmin
 
@@ -38,7 +47,7 @@ RUN mkdir /home/gpadmin/bin_gpdb
 
 ENV TARGET_OS=ubuntu
 ENV OUTPUT_ARTIFACT_DIR=bin_gpdb
-ENV CONFIGURE_FLAGS="--enable-debug-extensions --with-gssapi --enable-cassert --enable-debug --enable-depend" 
+ENV CONFIGURE_FLAGS="--enable-debug-extensions --with-gssapi --enable-cassert --enable-debug --enable-depend"
 ENV PYTHON3=/opt/adb6-python3.9/bin/python3
 
 # Compile with running mocking tests