fixup

2024-05-31 09:43:40 -04:00 · 2024-05-31 09:43:40 -04:00 · 3a7be2f321
parent 41402ac3d1
commit 3a7be2f321
13 changed files with 26 additions and 31 deletions
--- a/12/alpine3.19/Dockerfile
+++ b/12/alpine3.19/Dockerfile
@ -119,8 +119,8 @@ RUN set -eux; \
 		--with-icu \
 		--with-llvm \
 	; \
-	make -j "$(nproc)" world; \
-	make install-world; \
+	make -j "$(nproc)" world-bin; \
+	make install-world-bin; \
 	make -C contrib install; \
 	\
 	runDeps="$( \
--- a/12/alpine3.20/Dockerfile
+++ b/12/alpine3.20/Dockerfile
@ -119,8 +119,8 @@ RUN set -eux; \
 		--with-icu \
 		--with-llvm \
 	; \
-	make -j "$(nproc)" world; \
-	make install-world; \
+	make -j "$(nproc)" world-bin; \
+	make install-world-bin; \
 	make -C contrib install; \
 	\
 	runDeps="$( \
--- a/13/alpine3.19/Dockerfile
+++ b/13/alpine3.19/Dockerfile
@ -119,8 +119,8 @@ RUN set -eux; \
 		--with-icu \
 		--with-llvm \
 	; \
-	make -j "$(nproc)" world; \
-	make install-world; \
+	make -j "$(nproc)" world-bin; \
+	make install-world-bin; \
 	make -C contrib install; \
 	\
 	runDeps="$( \
--- a/13/alpine3.20/Dockerfile
+++ b/13/alpine3.20/Dockerfile
@ -119,8 +119,8 @@ RUN set -eux; \
 		--with-icu \
 		--with-llvm \
 	; \
-	make -j "$(nproc)" world; \
-	make install-world; \
+	make -j "$(nproc)" world-bin; \
+	make install-world-bin; \
 	make -C contrib install; \
 	\
 	runDeps="$( \
--- a/14/alpine3.19/Dockerfile
+++ b/14/alpine3.19/Dockerfile
@ -122,8 +122,8 @@ RUN set -eux; \
 		--with-llvm \
 		--with-lz4 \
 	; \
-	make -j "$(nproc)" world; \
-	make install-world; \
+	make -j "$(nproc)" world-bin; \
+	make install-world-bin; \
 	make -C contrib install; \
 	\
 	runDeps="$( \
--- a/14/alpine3.20/Dockerfile
+++ b/14/alpine3.20/Dockerfile
@ -122,8 +122,8 @@ RUN set -eux; \
 		--with-llvm \
 		--with-lz4 \
 	; \
-	make -j "$(nproc)" world; \
-	make install-world; \
+	make -j "$(nproc)" world-bin; \
+	make install-world-bin; \
 	make -C contrib install; \
 	\
 	runDeps="$( \
--- a/15/alpine3.19/Dockerfile
+++ b/15/alpine3.19/Dockerfile
@ -125,8 +125,8 @@ RUN set -eux; \
 		--with-lz4 \
 		--with-zstd \
 	; \
-	make -j "$(nproc)" world; \
-	make install-world; \
+	make -j "$(nproc)" world-bin; \
+	make install-world-bin; \
 	make -C contrib install; \
 	\
 	runDeps="$( \
--- a/15/alpine3.20/Dockerfile
+++ b/15/alpine3.20/Dockerfile
@ -125,8 +125,8 @@ RUN set -eux; \
 		--with-lz4 \
 		--with-zstd \
 	; \
-	make -j "$(nproc)" world; \
-	make install-world; \
+	make -j "$(nproc)" world-bin; \
+	make install-world-bin; \
 	make -C contrib install; \
 	\
 	runDeps="$( \
--- a/16/alpine3.19/Dockerfile
+++ b/16/alpine3.19/Dockerfile
@ -124,8 +124,8 @@ RUN set -eux; \
 		--with-lz4 \
 		--with-zstd \
 	; \
-	make -j "$(nproc)" world; \
-	make install-world; \
+	make -j "$(nproc)" world-bin; \
+	make install-world-bin; \
 	make -C contrib install; \
 	\
 	runDeps="$( \
--- a/16/alpine3.20/Dockerfile
+++ b/16/alpine3.20/Dockerfile
@ -124,8 +124,8 @@ RUN set -eux; \
 		--with-lz4 \
 		--with-zstd \
 	; \
-	make -j "$(nproc)" world; \
-	make install-world; \
+	make -j "$(nproc)" world-bin; \
+	make install-world-bin; \
 	make -C contrib install; \
 	\
 	runDeps="$( \
--- a/17/alpine3.19/Dockerfile
+++ b/17/alpine3.19/Dockerfile
@ -123,8 +123,8 @@ RUN set -eux; \
 		--with-lz4 \
 		--with-zstd \
 	; \
-	make -j "$(nproc)" all; \
-	make install; \
+	make -j "$(nproc)" world-bin; \
+	make install-world-bin; \
 	make -C contrib install; \
 	\
 	runDeps="$( \
--- a/17/alpine3.20/Dockerfile
+++ b/17/alpine3.20/Dockerfile
@ -123,8 +123,8 @@ RUN set -eux; \
 		--with-lz4 \
 		--with-zstd \
 	; \
-	make -j "$(nproc)" all; \
-	make install; \
+	make -j "$(nproc)" world-bin; \
+	make install-world-bin; \
 	make -C contrib install; \
 	\
 	runDeps="$( \
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@ -135,13 +135,8 @@ RUN set -eux; \
 		--with-zstd \
 {{ ) else "" end -}}
 	; \
-{{ if .major >= 17 then ( -}}
-	make -j "$(nproc)" all; \
-	make install; \
-{{ ) else ( -}}
-	make -j "$(nproc)" world; \
-	make install-world; \
-{{ ) end -}}
+	make -j "$(nproc)" world-bin; \
+	make install-world-bin; \
 	make -C contrib install; \
 	\
 	runDeps="$( \