fix(pack-images): gdal not found

Author: duanhongyi

Dockerfile.run

@@ -9,7 +9,9 @@ ENV DRYCC_UID=1001 \
 
 RUN groupadd drycc --gid ${DRYCC_GID} \
   && useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR} \
-  && chown ${DRYCC_GID}:${DRYCC_UID} /opt
+  && chown ${DRYCC_GID}:${DRYCC_UID} /opt /etc/ld.so.conf.d \
+  && install-packages sudo \
+  && echo "drycc ALL=(root) NOPASSWD:/usr/sbin/ldconfig" > /etc/sudoers.d/drycc
 
 USER ${DRYCC_UID}
 # Pack style, `=` cannot be used

buildpacks/go/bin/build

@@ -7,7 +7,6 @@ echo "---> Go Buildpack"
 layers_dir=$1
 plan_path=$3
 
-rm -rf /opt/drycc; ln -s "${layers_dir}" /opt/drycc
 # shellcheck source=/dev/null
 . generate-layers.sh "${layers_dir}"
 generate_deps_layer build-deps

buildpacks/java/bin/build

@@ -5,7 +5,6 @@ shopt -s  expand_aliases
 layers_dir=$1
 plan_path=$3
 
-rm -rf /opt/drycc; ln -s "${layers_dir}" /opt/drycc
 # shellcheck source=/dev/null
 . generate-layers.sh "${layers_dir}"
 generate_deps_layer build-deps

buildpacks/node/bin/build

@@ -7,8 +7,6 @@ echo "---> Node Buildpack"
 layers_dir=$1
 plan_path=$3
 
-rm -rf /opt/drycc; ln -s "${layers_dir}" /opt/drycc
-
 # 2. Install build deps
 # shellcheck source=/dev/null
 . generate-layers.sh "${layers_dir}"

buildpacks/php/bin/build

@@ -14,7 +14,6 @@ bp_dir=$(
   cd "$(dirname "$0")"/..
   pwd
 )
-rm -rf /opt/drycc; ln -s "${layers_dir}" /opt/drycc
 
 # 2. Install build deps
 # shellcheck source=/dev/null

buildpacks/python/bin/build

@@ -7,8 +7,6 @@ echo "---> Python Buildpack"
 layers_dir=$1
 plan_path=$3
 
-rm -rf /opt/drycc; ln -s "${layers_dir}" /opt/drycc
-
 # 2. Install build deps
 # shellcheck source=/dev/null
 . generate-layers.sh "${layers_dir}"

buildpacks/ruby/bin/build

@@ -6,8 +6,6 @@ echo "---> Ruby Buildpack"
 layers_dir=$1
 plan_path=$3
 
-rm -rf /opt/drycc; ln -s "${layers_dir}" /opt/drycc
-
 # 2. Install build deps
 # shellcheck source=/dev/null
 . generate-layers.sh "${layers_dir}"

buildpacks/rust/bin/build

@@ -7,8 +7,6 @@ echo "---> Rust Buildpack"
 layers_dir=$1
 plan_path=$3
 
-rm -rf /opt/drycc; ln -s "${layers_dir}" /opt/drycc
-
 # 2. Install build deps
 # shellcheck source=/dev/null
 . generate-layers.sh "${layers_dir}"

rootfs/usr/local/bin/apt-utils.sh

@@ -33,7 +33,18 @@ apt-install() {
         if [[ ! -f "${DEB_FILE}" ]] ; then
             curl -fsSL -o "${DEB_FILE}" "${DEB_URL}"
         fi
+        dpkg -e "${DEB_FILE}" "$APT_INSTALL_DIR"/DEBIAN
+        if [[ -f "$APT_INSTALL_DIR"/DEBIAN/preinst ]] ; then
+            sed -i "s#/usr/lib/#$APT_INSTALL_DIR/usr/lib/#g" "$APT_INSTALL_DIR"/DEBIAN/preinst
+            "$APT_INSTALL_DIR"/DEBIAN/preinst install 2>/dev/null || echo "skip exec ${DEB_FILE} postinst"
+        fi
         dpkg -x "${DEB_FILE}" "$APT_INSTALL_DIR"
+        if [[ -f "$APT_INSTALL_DIR"/DEBIAN/postinst ]] ; then
+            sed -i "s#/usr/lib/#$APT_INSTALL_DIR/usr/lib/#g" "$APT_INSTALL_DIR"/DEBIAN/postinst
+            "$APT_INSTALL_DIR"/DEBIAN/postinst configure 2>/dev/null || echo "skip exec ${DEB_FILE} postinst"
+        fi
+        rm -rf "$APT_INSTALL_DIR"/DEBIAN
+        
         pkgconfig_list=$(find "$APT_INSTALL_DIR"/usr/lib/*-linux-gnu/pkgconfig/*.pc 2>/dev/null || echo "")
         for pkgconfig in ${pkgconfig_list}
         do

rootfs/usr/local/bin/generate-layers.sh

@@ -16,15 +16,21 @@ _install_deps() {
 
 _create_deps_profile() {
     local deps_layer_dir="$1"
-    mkdir -p "${deps_layer_dir}/profile.d"
+    mkdir -p "${deps_layer_dir}"/profile.d
+    mkdir -p "${deps_layer_dir}"/etc/ld.so.conf.d
     cat > "${deps_layer_dir}/profile.d/deps.sh" <<EOL
 export PATH="${deps_layer_dir}/usr/bin:${deps_layer_dir}/bin:\${PATH}"
 export C_INCLUDE_PATH="${deps_layer_dir}/usr/include:\${C_INCLUDE_PATH}"
 export CPLUS_INCLUDE_PATH="${deps_layer_dir}/usr/include:\${CPLUS_INCLUDE_PATH}"
-export LIBRARY_PATH="${deps_layer_dir}/lib:${deps_layer_dir}/lib/$(uname -m)-linux-gnu:${deps_layer_dir}/usr/lib:${deps_layer_dir}/usr/lib/$(uname -m)-linux-gnu:\${LIBRARY_PATH}"
-export LD_LIBRARY_PATH="${deps_layer_dir}/lib:${deps_layer_dir}/lib/$(uname -m)-linux-gnu:${deps_layer_dir}/usr/lib:${deps_layer_dir}/usr/lib/$(uname -m)-linux-gnu:\${LD_LIBRARY_PATH}"
 export PKG_CONFIG_PATH="${deps_layer_dir}/lib/$(uname -m)-linux-gnu/pkg-config:${deps_layer_dir}/usr/lib/$(uname -m)-linux-gnu/pkg-config:\${PKG_CONFIG_PATH}"
 EOL
+    cat > "${deps_layer_dir}/etc/ld.so.conf.d/deps.conf" <<EOL
+${deps_layer_dir}/lib
+${deps_layer_dir}/lib/$(uname -m)-linux-gnu
+${deps_layer_dir}/usr/lib
+${deps_layer_dir}/usr/lib/$(uname -m)-linux-gnu
+EOL
+    sudo ldconfig
 }
 
 _create_deps_metadata() {
@@ -48,10 +54,13 @@ EOL
 generate_base_layer() {
     base_layer="${layers_dir}"/base
     mkdir -p "${base_layer}/profile.d" 
-    cat > "${base_layer}/profile.d/base.sh" <<EOL
+    cat > "${base_layer}/profile.d/link.sh" <<EOL
     rm -rf /opt/drycc
     ln -s "${layers_dir}" /opt/drycc
+    echo "include ${layers_dir}/*/etc/ld.so.conf.d/*.conf" > /etc/ld.so.conf.d/drycc.conf
+    sudo ldconfig
 EOL
+    bash "${base_layer}/profile.d/link.sh"
     cat > "${base_layer}.toml" <<EOL
 [types]
 cache = true