SPAE-153, Fixed dw image

tembo-io · May 15, 2024 · c7dcb0b · c7dcb0b
1 parent b6a2dfe
commit c7dcb0b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 26 deletions.
diff --git a/dw-cnpg/Dockerfile b/dw-cnpg/Dockerfile
@@ -34,28 +34,6 @@ RUN apt-get update && apt-get install -y \
     zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
-# Clone and build AWS SDK for C++
-RUN git clone https://github.com/aws/aws-sdk-cpp.git && \
-    cd aws-sdk-cpp && \
-    git checkout 1.9.263 && \
-    git submodule update --init --recursive && \
-    mkdir build && cd build && \
-    cmake -DBUILD_ONLY="s3;core;config;sts;cognito-identity;transfer;identity-management" -DAUTORUN_UNIT_TESTS=OFF -DCMAKE_CXX_FLAGS=-Wno-error=deprecated-declarations .. && \
-    make -j$(nproc) && \
-    make install && \
-    cd ../../ && rm -rf aws-sdk-cpp
-
-# Clone and build Apache Arrow
-RUN git clone https://github.com/apache/arrow.git && \
-    cd arrow && \
-    git checkout apache-arrow-7.0.1 && \
-    cd cpp && \
-    mkdir build && cd build && \
-    cmake -DARROW_PARQUET=ON -DARROW_S3=ON -DARROW_WITH_SNAPPY=ON .. && \ 
-    make -j$(nproc) && \
-    make install && \
-    cd ../../ && rm -rf arrow
-
 # Clone and build parquet_s3_fdw
 RUN git clone https://github.com/pgspider/parquet_s3_fdw.git && \
     cd parquet_s3_fdw && \
@@ -69,7 +47,6 @@ RUN set -eux; \
       cp -r $(pg_config --sharedir)/* /tmp/pg_sharedir;
 
 ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-ENV XDG_CACHE_HOME=/var/lib/postgresql/data/tembo/.cache
 
 # Revert the postgres user to id 26
 RUN usermod -u 26 postgres

diff --git a/standard-cnpg/Dockerfile b/standard-cnpg/Dockerfile
@@ -92,7 +92,7 @@ RUN git clone https://github.com/aws/aws-sdk-cpp.git && \
     cmake -DBUILD_ONLY="s3;core;config;sts;cognito-identity;transfer;identity-management" -DAUTORUN_UNIT_TESTS=OFF -DCMAKE_CXX_FLAGS=-Wno-error=deprecated-declarations .. && \ 
     make -j$(nproc) && \
     make install && \
-    cd ../../ && rm -rf aws-sdk-cpp
+    cd ../../../ && rm -rf aws-sdk-cpp
 
 # Install auto_explain
 RUN /usr/bin/trunk install auto_explain
@@ -106,7 +106,7 @@ RUN git clone https://github.com/apache/arrow.git && \
     cmake -DARROW_PARQUET=ON -DARROW_S3=ON -DARROW_WITH_SNAPPY=ON .. && \
     make -j$(nproc) && \
     make install && \
-    cd ../../ && rm -rf arrow
+    cd ../../../ && rm -rf arrow
 
 # cache pg_stat_statements and auto_explain and pg_stat_kcache to temp directory
 RUN set -eux; \
@@ -117,7 +117,6 @@ RUN set -eux; \
 
 # cache all extensions
 ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-ENV XDG_CACHE_HOME=/var/lib/postgresql/data/tembo/.cache
 
 # Revert the postgres user to id 26
 RUN usermod -u 26 postgres