now from template

citusdata · Nov 10, 2023 · 765acfb · 765acfb
1 parent 9123802
commit 765acfb
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/dockerfiles/debian-bookworm-all/Dockerfile b/dockerfiles/debian-bookworm-all/Dockerfile
@@ -113,8 +113,8 @@ RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \
     tar -zxvf cmake-3.22.2.tar.gz && \
     cd cmake-3.22.2 && ./bootstrap && \
-    make && \
-    make install && \
+    MAKEFLAGS="-j $(nproc)" make && \
+    MAKEFLAGS="-j $(nproc)" make install && \
     rm -f cmake-3.22.2.tar.gz && \
     rm -rf cmake-3.22.2
 

diff --git a/dockerfiles/debian-bullseye-all/Dockerfile b/dockerfiles/debian-bullseye-all/Dockerfile
@@ -113,8 +113,8 @@ RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \
     tar -zxvf cmake-3.22.2.tar.gz && \
     cd cmake-3.22.2 && ./bootstrap && \
-    make && \
-    make install && \
+    MAKEFLAGS="-j $(nproc)" make && \
+    MAKEFLAGS="-j $(nproc)" make install && \
     rm -f cmake-3.22.2.tar.gz && \
     rm -rf cmake-3.22.2
 

diff --git a/dockerfiles/debian-buster-all/Dockerfile b/dockerfiles/debian-buster-all/Dockerfile
@@ -113,8 +113,8 @@ RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \
     tar -zxvf cmake-3.22.2.tar.gz && \
     cd cmake-3.22.2 && ./bootstrap && \
-    make && \
-    make install && \
+    MAKEFLAGS="-j $(nproc)" make && \
+    MAKEFLAGS="-j $(nproc)" make install && \
     rm -f cmake-3.22.2.tar.gz && \
     rm -rf cmake-3.22.2
 

diff --git a/dockerfiles/ubuntu-bionic-all/Dockerfile b/dockerfiles/ubuntu-bionic-all/Dockerfile
@@ -113,8 +113,8 @@ RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \
     tar -zxvf cmake-3.22.2.tar.gz && \
     cd cmake-3.22.2 && ./bootstrap && \
-    make && \
-    make install && \
+    MAKEFLAGS="-j $(nproc)" make && \
+    MAKEFLAGS="-j $(nproc)" make install && \
     rm -f cmake-3.22.2.tar.gz && \
     rm -rf cmake-3.22.2
 

diff --git a/dockerfiles/ubuntu-focal-all/Dockerfile b/dockerfiles/ubuntu-focal-all/Dockerfile
@@ -113,8 +113,8 @@ RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \
     tar -zxvf cmake-3.22.2.tar.gz && \
     cd cmake-3.22.2 && ./bootstrap && \
-    make && \
-    make install && \
+    MAKEFLAGS="-j $(nproc)" make && \
+    MAKEFLAGS="-j $(nproc)" make install && \
     rm -f cmake-3.22.2.tar.gz && \
     rm -rf cmake-3.22.2
 

diff --git a/dockerfiles/ubuntu-kinetic-all/Dockerfile b/dockerfiles/ubuntu-kinetic-all/Dockerfile
@@ -113,8 +113,8 @@ RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \
     tar -zxvf cmake-3.22.2.tar.gz && \
     cd cmake-3.22.2 && ./bootstrap && \
-    make && \
-    make install && \
+    MAKEFLAGS="-j $(nproc)" make && \
+    MAKEFLAGS="-j $(nproc)" make install && \
     rm -f cmake-3.22.2.tar.gz && \
     rm -rf cmake-3.22.2
 

diff --git a/templates/Dockerfile-deb.tmpl b/templates/Dockerfile-deb.tmpl
@@ -113,8 +113,8 @@ RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \
     tar -zxvf cmake-3.22.2.tar.gz && \
     cd cmake-3.22.2 && ./bootstrap && \
-    make && \
-    make install && \
+    MAKEFLAGS="-j $(nproc)" make && \
+    MAKEFLAGS="-j $(nproc)" make install && \
     rm -f cmake-3.22.2.tar.gz && \
     rm -rf cmake-3.22.2