Install ADCC-extension dependencies in Dockerfile

arenadata · Nov 22, 2024 · ab4d516 · ab4d516
1 parent c69f669
commit ab4d516
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/arenadata/Dockerfile b/arenadata/Dockerfile
@@ -31,7 +31,8 @@ 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-compiler && \
+    pip3 install protobuf==3.20.0 && \
     # 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 +89,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

diff --git a/arenadata/Dockerfile.ubuntu b/arenadata/Dockerfile.ubuntu
@@ -23,7 +23,7 @@ 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
@@ -38,9 +38,12 @@ 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
 
+# Protobuf for ADCC-extension tests
+RUN $PYTHON3 -m pip install protobuf==3.20.0
+
 # Compile with running mocking tests
 RUN bash /home/gpadmin/gpdb_src/concourse/scripts/compile_gpdb.bash