Split git build from build_base image

Author: mayeut

docker/Dockerfile

@@ -63,15 +63,26 @@ COPY build_scripts/build.sh /build_scripts/
 COPY build_scripts/build_env.sh /build_scripts/
 RUN manylinux-entrypoint bash build_scripts/build.sh
 
+
+FROM build_base AS build_git
+COPY build_scripts/build-git.sh /build_scripts/
+RUN export GIT_ROOT=git-2.30.0 && \
+    export GIT_HASH=d24c4fa2a658318c2e66e25ab67cc30038a35696d2d39e6b12ceccf024de1e5e && \
+    export GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git && \
+    manylinux-entrypoint /build_scripts/build-git.sh
+
+
 FROM build_base AS build_cmake
-COPY build_scripts/build-cmake.sh /build_scripts/build-cmake.sh
+COPY build_scripts/build-cmake.sh /build_scripts/
 RUN export CMAKE_VERSION=3.18.3 && \
     export CMAKE_HASH=2c89f4e30af4914fd6fb5d00f863629812ada848eee4e2d29ec7e456d7fa32e5 && \
     export CMAKE_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download && \
     manylinux-entrypoint /build_scripts/build-cmake.sh
 
+
 FROM runtime_base
 COPY --from=build_base /manylinux-rootfs /
+COPY --from=build_git /manylinux-rootfs /
 COPY --from=build_cmake /manylinux-rootfs /
 COPY --from=build_base /opt/_internal /opt/_internal/
 COPY build_scripts/build_utils.sh /build_scripts/build_utils.sh

docker/build_scripts/build-git.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+# Top-level build script called from Dockerfile
+
+# Stop at any error, show all commands
+set -exuo pipefail
+
+# Get script directory
+MY_DIR=$(dirname "${BASH_SOURCE[0]}")
+
+# Get build utilities
+source $MY_DIR/build_utils.sh
+
+# Install newest libtool
+check_var ${GIT_ROOT}
+check_var ${GIT_HASH}
+check_var ${GIT_DOWNLOAD_URL}
+
+fetch_source ${GIT_ROOT}.tar.gz ${GIT_DOWNLOAD_URL}
+check_sha256sum ${GIT_ROOT}.tar.gz ${GIT_HASH}
+tar -xzf ${GIT_ROOT}.tar.gz
+pushd ${GIT_ROOT}
+make -j$(nproc) install prefix=/usr/local NO_GETTEXT=1 NO_TCLTK=1 DESTDIR=/manylinux-rootfs
+popd
+rm -rf ${GIT_ROOT} ${GIT_ROOT}.tar.gz
+
+
+# Strip what we can
+strip_ /manylinux-rootfs
+
+# Install
+cp -rf /manylinux-rootfs/* /
+
+git version

docker/build_scripts/build.sh

@@ -19,10 +19,6 @@ CMAKE_DEPS="openssl-devel zlib-devel libcurl-devel"
 # Development tools and libraries
 yum -y install ${PYTHON_COMPILE_DEPS} ${CMAKE_DEPS}
 
-# Install git
-build_git $GIT_ROOT $GIT_HASH
-/manylinux-rootfs/usr/local/bin/git version
-
 # Install a more recent SQLite3
 curl -fsSLO $SQLITE_AUTOCONF_DOWNLOAD_URL/$SQLITE_AUTOCONF_ROOT.tar.gz
 check_sha256sum $SQLITE_AUTOCONF_ROOT.tar.gz $SQLITE_AUTOCONF_HASH

docker/build_scripts/build_env.sh

@@ -7,7 +7,3 @@ CPYTHON_VERSIONS="3.5.10 3.6.12 3.7.9 3.8.7 3.9.1"
 SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3340000
 SQLITE_AUTOCONF_HASH=bf6db7fae37d51754737747aaaf413b4d6b3b5fbacd52bdb2d0d6e5b2edd9aee
 SQLITE_AUTOCONF_DOWNLOAD_URL=https://www.sqlite.org/2020
-
-GIT_ROOT=git-2.30.0
-GIT_HASH=d24c4fa2a658318c2e66e25ab67cc30038a35696d2d39e6b12ceccf024de1e5e
-GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git

docker/build_scripts/build_utils.sh

@@ -98,20 +98,6 @@ function check_sha256sum {
 }
 
 
-function build_git {
-    local git_fname=$1
-    check_var ${git_fname}
-    local git_sha256=$2
-    check_var ${git_sha256}
-    check_var ${GIT_DOWNLOAD_URL}
-    fetch_source ${git_fname}.tar.gz ${GIT_DOWNLOAD_URL}
-    check_sha256sum ${git_fname}.tar.gz ${git_sha256}
-    tar -xzf ${git_fname}.tar.gz
-    (cd ${git_fname} && make -j$(nproc) install prefix=/usr/local NO_GETTEXT=1 NO_TCLTK=1 DESTDIR=/manylinux-rootfs > /dev/null)
-    rm -rf ${git_fname} ${git_fname}.tar.gz
-}
-
-
 function do_standard_install {
     ./configure "$@" > /dev/null
     make -j$(nproc) > /dev/null