fix(pack-images): failure writing output to destination

Author: duanhongyi

Dockerfile.build

@@ -5,7 +5,7 @@ USER root
 RUN cp -rf /var/lib/dpkg /var/lib/dpkg-run; \
   \
   \
-  install-packages zlib1g git autoconf pkg-config build-essential; \
+  install-packages zlib1g git autoconf pkg-config build-essential zip unzip; \
   install-stack jq 1.6; \
   install-stack yj 5.1.0; \
   cp -rf /opt/drycc/*/bin/* /usr/local/bin; \

buildpacks/go/bin/build

@@ -17,36 +17,29 @@ generate_deps_layer run-deps
 
 # 2. DOWNLOAD go
 generate_stack_layer go "${plan_path}" false
-go_cache_layer_dir="${layers_dir}/go_cache"
-
 # shellcheck source=/dev/null
 . init-stack
 
-# Compares previous go.mod checksum to the current go.mod
-local_mod_checksum=$(sha256sum go.mod | cut -d ' ' -f 1 || echo 'not found')
-remote_mod_checksum='not found'
-if [[ -f "${go_cache_layer_dir}.toml" ]]; then
-  remote_mod_checksum=$(yj <"${go_cache_layer_dir}.toml" -t | jq -r .metadata 2>/dev/null || echo 'not found')
-fi
-mkdir -p "${go_cache_layer_dir}"
-
-if [[ -f go.mod && "${local_mod_checksum}" == "${remote_mod_checksum}" ]]; then
-  echo "---> Reusing go.mod"
-else
-  echo "---> Installing go.mod with go mod vendor"
-  rm "${go_cache_layer_dir}/pkg" -rf
-  go mod download
-fi
-cat >"${go_cache_layer_dir}.toml" <<EOL
+# 3 build target
+target_layer_dir="${layers_dir}"/target
+mkdir -p "${target_layer_dir}"/{bin,profile.d}
+echo "---> Start building ${DRYCC_APP} version"
+
+cp -rf "$(pwd)" "${target_layer_dir}"/source \
+  && cd "${target_layer_dir}"/source \
+  && go mod vendor \
+  && go build -o "${target_layer_dir}/bin/${DRYCC_APP}" -v . \
+  && cd - \
+  && rm -rf "${target_layer_dir}"/source
+
+cat >"${target_layer_dir}.toml" <<EOL
 [types]
 cache = true
 build = true
-launch = false
-
-[metadata]
-version = "${local_mod_checksum}"
+launch = true
+EOL
+cat >"${target_layer_dir}/profile.d/target.sh" <<EOL
+export PATH="${target_layer_dir}/bin:${PATH}"
 EOL
 
-go mod vendor
-go build -o main -v .
-generate-launch.sh "${layers_dir}"
+generate-launch.sh "${layers_dir}"

buildpacks/java/bin/build

@@ -27,20 +27,30 @@ bp_dir=$(
 )
 
 build_choice="maven"
-if [ -f pom.xml ] && [ -f gradlew ]; then
+if [ -f mvnw ] && [ -f gradlew ]; then
   if [[ -f .build-choice ]]; then
     build_choice=$(tr <.build-choice -d '[:space:]')
   fi
-elif [ -f pom.xml ] && [ ! -f gradlew ]; then
+elif [ -f mvnw ]; then
   build_choice="maven"
-elif [ -f gradlew ] && [ ! -f pom.xml ]; then
+elif [ -f gradlew ]; then
   build_choice="gradle"
 fi
 
+target_layer_dir="${layers_dir}/target"
+mkdir -p "${target_layer_dir}"/profile.d
+
 if [ "${build_choice}" == "maven" ]; then
-  "$bp_dir/lib/maven_build" "${layers_dir}"
+  "$bp_dir/lib/maven_build" "${layers_dir}" "${target_layer_dir}"
 elif [ "${build_choice}" == "gradle" ]; then
-  "$bp_dir/lib/gradle_build" "${layers_dir}"
+  "$bp_dir/lib/gradle_build" "${layers_dir}" "${target_layer_dir}"
 fi
 
+cat >"${target_layer_dir}.toml" <<EOL
+[types]
+cache = false
+build = true
+launch = true
+EOL
+
 generate-launch.sh "${layers_dir}"

buildpacks/java/lib/gradle_build

@@ -1,19 +1,28 @@
 #!/usr/bin/env bash
 layers_dir=$1
-
+target_layer_dir=$2
 gradle_layer_dir="${layers_dir}/gradle"
+mkdir -p "${gradle_layer_dir}"
+export GRADLE_USER_HOME="${gradle_layer_dir}"
+# gradle build
+echo "---> Building target with gradle"
+cp -rf "$(pwd)" /tmp/source \
+  && cd /tmp/source \
+  && ./gradlew clean build -x test --no-daemon \
+  && mv /tmp/source/build "${target_layer_dir}" \
+  && cd -
 
-if [[ ! -d ${gradle_layer_dir} ]]; then
-  mkdir -p ${gradle_layer_dir}
+cat >"${target_layer_dir}/profile.d/target.sh" <<EOL
+# only execute at runtime
+if [ -z "\$INIT_STACK" ]; then
+  rm -rf $(pwd)/build
+  cp -rf ${target_layer_dir}/build $(pwd)
 fi
-cat > "${gradle_layer_dir}.toml" << EOF
+EOL
+
+cat >"${gradle_layer_dir}.toml" <<EOL
 [types]
 cache = true
-EOF
-ln -s ${gradle_layer_dir} $HOME/.gradle
-
-# 5. RUN BUILD
-echo "---> Running Gradle Wrapper"
-./gradlew clean build -x test --no-daemon
-
-
+build = true
+launch = false
+EOL

buildpacks/java/lib/maven_build

@@ -1,46 +1,28 @@
 #!/usr/bin/env bash
 layers_dir=$1
+target_layer_dir=$2
+maven_layer_dir="${layers_dir}/maven"
+mkdir -p "${maven_layer_dir}"
+# maven build
+echo "---> Building target with maven"
+cp -rf "$(pwd)" /tmp/source \
+  && cd /tmp/source \
+  && ln -s "${layers_dir}/maven" "${HOME}/.m2" \
+  && ./mvnw clean install -B -DskipTests \
+  && mv /tmp/source/target "${target_layer_dir}" \
+  && cd -
 
-# 4. MAKE MAVEN M2 CACHE LAYER
-m2_layer_dir="${layers_dir}/maven_m2"
-if [[ ! -d "${m2_layer_dir}" ]]; then
-  mkdir -p "${m2_layer_dir}"
+cat >"${target_layer_dir}/profile.d/target.sh" <<EOL
+# only execute at runtime
+if [ -z "\$INIT_STACK" ]; then
+  rm -rf $(pwd)/target
+  cp -rf ${target_layer_dir}/target $(pwd)
 fi
-cat > "${m2_layer_dir}.toml" << EOF
-[types]
-cache = true
-EOF
-ln -s "${m2_layer_dir}" "$HOME/.m2"
-# 5. RUN BUILD
-MAVEN_OPTS="${MAVEN_OPTS:-"-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"}"
+EOL
 
-if [[ -x mvnw ]]; then
-  echo "---> Running Maven Wrapper"
-  ./mvnw clean install -B -DskipTests
-else
-  maven_url="https://apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz"
-  maven_version="3.5.4"
-  maven_layer_dir="${layers_dir}/maven"
-  if [[ -f "${layers_dir}/maven.toml" ]]; then
-    cached_maven_url=$(cat "${maven_layer_dir}.toml" | yj -t | jq -r .metadata.url 2>/dev/null || echo 'Maven TOML parsing failed')
-  fi
-  if [[ "${maven_url}" != "${cached_maven_url}" ]] ; then
-    echo "---> Installing Maven"
-    rm -rf "${maven_layer_dir}"
-    mkdir -p "${maven_layer_dir}"
-    wget -q -O - "${maven_url}" | tar pxz -C "${maven_layer_dir}" --strip-components=1
-  fi
-  cat > "${maven_layer_dir}.toml" << EOF
+cat >"${maven_layer_dir}.toml" <<EOL
 [types]
-launch = true
-build = true
 cache = true
-[metadata]
-version = "${maven_version}"
-url = "${maven_url}"
-EOF
-  export PATH="${layers_dir}/maven/bin:${PATH}"
-  echo "---> Running Maven Wrapper"
-  mvn clean install -B -DskipTests
-fi
-
+build = true
+launch = false
+EOL

buildpacks/node/bin/build

@@ -24,7 +24,7 @@ generate_stack_layer node "${plan_path}" true
 
 # 4. install node modules
 node_modules_layer_dir="${layers_dir}/node_modules"
-mkdir -p "${node_modules_layer_dir}"
+mkdir -p "${node_modules_layer_dir}"/profile.d
 # Compares previous package.json checksum to the current package.json
 local_package_checksum=$(sha256sum package.json | cut -d ' ' -f 1 || echo 'not found')
 remote_package_checksum='not found'
@@ -34,14 +34,11 @@ fi
 
 if [[ -f package.json && "${local_package_checksum}" == "${remote_package_checksum}" ]]; then
   echo "---> Reusing package.json"
-  cp -r "${node_modules_layer_dir}"/* ./node_modules/
 elif [[ -f package.json ]]; then
   echo "---> Installing package.json with npm install."
-  rm "${node_modules_layer_dir}" -rf
-  npm install
-  cp -r ./node_modules "${node_modules_layer_dir}"
-fi
-cat >"${node_modules_layer_dir}.toml" <<EOL
+  cp package.json "${node_modules_layer_dir}"
+  cd "${node_modules_layer_dir}" && npm install && cd -
+  cat >"${node_modules_layer_dir}.toml" <<EOL
 [types]
 cache = true
 build = true
@@ -50,6 +47,13 @@ launch = true
 [metadata]
 version = "${local_package_checksum}"
 EOL
+  cat >"${node_modules_layer_dir}"/profile.d/copy_node_modules.sh <<EOL
+# only execute at runtime
+if [ -z "\$INIT_STACK" ]; then
+  cp -rf ${node_modules_layer_dir}/node_modules $(pwd)
+fi
+EOL
+fi
 
 json_get_key() {
   local file="$1"

buildpacks/php/bin/build

@@ -69,29 +69,29 @@ version = "${local_extensions_checksum}"
 EOL
 
 # Compares previous composer.json checksum to the current composer.json
-vendor_layer_dir="${layers_dir}/vendor"
-mkdir -p "${vendor_layer_dir}"
+composer_layer_dir="${layers_dir}"/composer
+mkdir -p "${composer_layer_dir}"/{vendor,profile.d}
 local_composer_checksum=$(sha256sum composer.json | cut -d ' ' -f 1 || echo 'not found')
 remote_composer_checksum="not found"
-if [[ -f "${vendor_layer_dir}.toml" ]]; then
-  remote_composer_checksum=$(yj <"${vendor_layer_dir}.toml" -t | jq -r .metadata.version 2>/dev/null || echo 'not found')
+if [[ -f "${composer_layer_dir}.toml" ]]; then
+  remote_composer_checksum=$(yj <"${composer_layer_dir}.toml" -t | jq -r .metadata.version 2>/dev/null || echo 'not found')
 fi
+cat >"${composer_layer_dir}/profile.d/composer.sh" <<EOL
+export COMPOSER_HOME=${composer_layer_dir}
+export COMPOSER_VENDOR_DIR=${composer_layer_dir}/vendor
+echo "include_path=.:${composer_layer_dir}" >> "${php_layer_dir}/config/php.ini"
+EOL
+# shellcheck source=/dev/null
+. init-stack
 
-composer config --no-plugins vendor-dir
 composer config --no-plugins bin-dir
-
+composer config --no-plugins vendor-dir
 if [[ -f composer.json && "${local_composer_checksum}" == "${remote_composer_checksum}" ]]; then
   echo "---> Reusing composer.json"
-  cp -r "${vendor_layer_dir}" "./vendor"
 else
   echo "---> Installing composer.json"
-  composer install --ignore-platform-reqs
-  if [[ -d "${vendor_layer_dir}" ]]; then
-    rm "${vendor_layer_dir:?}/*" -rf
-    cp -r vendor/. "${vendor_layer_dir}/"
-  fi
-fi
-cat >"${vendor_layer_dir}.toml" <<EOL
+  composer install
+  cat >"${composer_layer_dir}.toml" <<EOL
 [types]
 cache = true
 build = true
@@ -100,6 +100,7 @@ launch = true
 [metadata]
 version = "${local_composer_checksum}"
 EOL
+fi
 
 echo "---> Config nginx"
 nginx_layer_dir="${layers_dir}/nginx"
@@ -126,4 +127,4 @@ SH
 
 chmod +x "${php_layer_dir}/bin/php-nginx-fpm"
 
-generate-launch.sh "${layers_dir}"
+generate-launch.sh "${layers_dir}"

buildpacks/php/bin/install-extensions

@@ -23,16 +23,16 @@ pecl_extension_install() {
 
 urls_extension_install() {
   ext_url=${1:1:-1}
-  ext_tar=$(echo "${ext_url}" | awk -F "/" '{print $NF}')
-  ext=$(echo "${ext_tar}" | awk -F "-" '{print $1}')
+  ext_tmp="${php_layer_dir}"/tmp
+  ext_tar=/tmp/$(echo "${ext_url}" | awk -F "/" '{print $NF}')
+  ext=$(echo "${ext_tar}" | awk -F "-" '{print $1}' | awk -F "\/" '{print $3}')
   echo "---> Installing extension ${ext_url}"
   curl -fsSL "${ext_url}" -o "${ext_tar}" &&
-    mkdir -p /tmp/"${ext}" &&
-    tar -xf "${ext_tar}" -C /tmp/"${ext}" --strip-components=1 &&
-    rm "${ext_tar}" &&
-    php-ext-configure /tmp/"${ext}" --enable-"${ext}" --with-php-config="${php_layer_dir}"/bin/php-config &&
-    INSTALL_ROOT="${php_layer_dir}" php-ext-install --ini-name "${php_layer_dir}"/config/php.ini /tmp/"${ext}" &&
-    rm -r /tmp/"${ext}"
+    mkdir -p "${ext_tmp}" &&
+    tar -xf "${ext_tar}" -C "${ext_tmp}" --strip-components=1 &&
+    php-ext-configure "${ext_tmp}" --enable-"${ext}" --with-php-config="${php_layer_dir}"/bin/php-config &&
+    INSTALL_ROOT="${php_layer_dir}" php-ext-install --ini-name "${php_layer_dir}"/config/php.ini "${ext_tmp}" &&
+    rm -rf "${ext_tar}" "${ext_tmp}"
 }
 
 main() {

buildpacks/rust/bin/build

@@ -26,9 +26,43 @@ echo "-----> Building application using Cargo"
 if [ -s .cargo/config ]; then
   cp -f .cargo/config /opt/drycc/rust/config
 fi
-rm -rf target/
-cargo build --release
-mkdir -p target/release
-find /opt/drycc/rust/target/release -maxdepth 1 -type f -executable -exec cp -a -t target/release {} \;
 
-generate-launch.sh "${layers_dir}"
+# cargo layer
+cargo_layer_dir="${layers_dir}/cargo"
+mkdir -p "${cargo_layer_dir}"
+echo "---> Generating cargo layers"
+cat >"${cargo_layer_dir}.toml" <<EOL
+[types]
+cache = true
+build = true
+launch = false
+EOL
+
+# target layer
+target_layer_dir="${layers_dir}"/target
+mkdir -p "${target_layer_dir}"/{profile.d,release}
+
+echo "---> Building target with cargo"
+cp -rf "$(pwd)" /tmp/source \
+  && cd /tmp/source \
+  && export CARGO_HOME="${cargo_layer_dir}" \
+  && export CARGO_TARGET_DIR=/tmp/source/target \
+  && cargo build --release \
+  && find "${CARGO_TARGET_DIR}"/release -maxdepth 1 -type f -executable -exec cp -a -t "${target_layer_dir}"/release {} \; \
+  && cd -
+
+cat >"${target_layer_dir}.toml" <<EOL
+[types]
+cache = false
+build = true
+launch = true
+EOL
+cat >"${target_layer_dir}/profile.d/copy_target.sh" <<EOL
+# only execute at runtime
+if [ -z "\$INIT_STACK" ]; then
+  rm -rf $(pwd)/target
+  cp -rf ${target_layer_dir} $(pwd)
+fi
+EOL
+
+generate-launch.sh "${layers_dir}"