From 3a7be2f3213ce6e0f13f6a01b927d86aa53d9539 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Fri, 31 May 2024 09:43:40 -0400 Subject: [PATCH] fixup --- 12/alpine3.19/Dockerfile | 4 ++-- 12/alpine3.20/Dockerfile | 4 ++-- 13/alpine3.19/Dockerfile | 4 ++-- 13/alpine3.20/Dockerfile | 4 ++-- 14/alpine3.19/Dockerfile | 4 ++-- 14/alpine3.20/Dockerfile | 4 ++-- 15/alpine3.19/Dockerfile | 4 ++-- 15/alpine3.20/Dockerfile | 4 ++-- 16/alpine3.19/Dockerfile | 4 ++-- 16/alpine3.20/Dockerfile | 4 ++-- 17/alpine3.19/Dockerfile | 4 ++-- 17/alpine3.20/Dockerfile | 4 ++-- Dockerfile-alpine.template | 9 ++------- 13 files changed, 26 insertions(+), 31 deletions(-) diff --git a/12/alpine3.19/Dockerfile b/12/alpine3.19/Dockerfile index b146ec3621..ecc8522104 100644 --- 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="$( \ diff --git a/12/alpine3.20/Dockerfile b/12/alpine3.20/Dockerfile index e68037b78b..74d5277523 100644 --- 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="$( \ diff --git a/13/alpine3.19/Dockerfile b/13/alpine3.19/Dockerfile index 2320c0bef4..962b528885 100644 --- 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="$( \ diff --git a/13/alpine3.20/Dockerfile b/13/alpine3.20/Dockerfile index 43fa0ea471..eb373d2cd9 100644 --- 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="$( \ diff --git a/14/alpine3.19/Dockerfile b/14/alpine3.19/Dockerfile index 3666022f9f..74f2c53e78 100644 --- 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="$( \ diff --git a/14/alpine3.20/Dockerfile b/14/alpine3.20/Dockerfile index 0ea12b04fa..a577a1f994 100644 --- 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="$( \ diff --git a/15/alpine3.19/Dockerfile b/15/alpine3.19/Dockerfile index 37a1034597..0a34e0dc97 100644 --- 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="$( \ diff --git a/15/alpine3.20/Dockerfile b/15/alpine3.20/Dockerfile index 8c67066559..1fac96c7a4 100644 --- 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="$( \ diff --git a/16/alpine3.19/Dockerfile b/16/alpine3.19/Dockerfile index 89aab48dd8..09fb413aea 100644 --- 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="$( \ diff --git a/16/alpine3.20/Dockerfile b/16/alpine3.20/Dockerfile index d07b848af4..1620037cf1 100644 --- 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="$( \ diff --git a/17/alpine3.19/Dockerfile b/17/alpine3.19/Dockerfile index 6c3d203b44..4d6c3d61fb 100644 --- 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="$( \ diff --git a/17/alpine3.20/Dockerfile b/17/alpine3.20/Dockerfile index 022e161fa4..39375a0e16 100644 --- 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="$( \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 5243eaf412..8535b20a10 100644 --- 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="$( \