fix(pack-images): cache layer not found

Author: duanhongyi

buildpacks/go/bin/build

@@ -34,7 +34,8 @@ else
   echo "---> Installing go.mod with go mod vendor"
   rm "${go_cache_layer_dir}/pkg" -rf
   go mod download
-  cat >"${go_cache_layer_dir}.toml" <<EOL
+fi
+cat >"${go_cache_layer_dir}.toml" <<EOL
 [types]
 cache = true
 build = true
@@ -43,7 +44,6 @@ launch = false
 [metadata]
 version = "${local_mod_checksum}"
 EOL
-fi
 
 go mod vendor
 go build -o main -v .

buildpacks/java/lib/gradle_build

@@ -5,11 +5,11 @@ gradle_layer_dir="${layers_dir}/gradle"
 
 if [[ ! -d ${gradle_layer_dir} ]]; then
   mkdir -p ${gradle_layer_dir}
-  cat > "${gradle_layer_dir}.toml" << EOF
+fi
+cat > "${gradle_layer_dir}.toml" << EOF
 [types]
 cache = true
 EOF
-fi
 ln -s ${gradle_layer_dir} $HOME/.gradle
 
 # 5. RUN BUILD

buildpacks/java/lib/maven_build

@@ -5,11 +5,11 @@ layers_dir=$1
 m2_layer_dir="${layers_dir}/maven_m2"
 if [[ ! -d "${m2_layer_dir}" ]]; then
   mkdir -p "${m2_layer_dir}"
-  cat > "${m2_layer_dir}.toml" << EOF
+fi
+cat > "${m2_layer_dir}.toml" << EOF
 [types]
 cache = true
 EOF
-fi
 ln -s "${m2_layer_dir}" "$HOME/.m2"
 # 5. RUN BUILD
 MAVEN_OPTS="${MAVEN_OPTS:-"-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"}"
@@ -29,7 +29,8 @@ else
     rm -rf "${maven_layer_dir}"
     mkdir -p "${maven_layer_dir}"
     wget -q -O - "${maven_url}" | tar pxz -C "${maven_layer_dir}" --strip-components=1
-    cat > "${maven_layer_dir}.toml" << EOF
+  fi
+  cat > "${maven_layer_dir}.toml" << EOF
 [types]
 launch = true
 build = true
@@ -38,7 +39,6 @@ cache = true
 version = "${maven_version}"
 url = "${maven_url}"
 EOF
-  fi
   export PATH="${layers_dir}/maven/bin:${PATH}"
   echo "---> Running Maven Wrapper"
   mvn clean install -B -DskipTests

buildpacks/node/bin/build

@@ -39,7 +39,8 @@ elif [[ -f package.json ]]; then
   rm "${node_modules_layer_dir}" -rf
   npm install
   cp -r ./node_modules "${node_modules_layer_dir}"
-  cat >"${node_modules_layer_dir}.toml" <<EOL
+fi
+cat >"${node_modules_layer_dir}.toml" <<EOL
 [types]
 cache = true
 build = true
@@ -48,7 +49,6 @@ launch = true
 [metadata]
 version = "${local_package_checksum}"
 EOL
-fi
 
 json_get_key() {
   local file="$1"

buildpacks/php/bin/build

@@ -54,7 +54,8 @@ elif [[ -f extensions.json ]]; then
   rm "${php_layer_dir}"/ext/* -rf
   cp -f "${bp_dir}/config/php/php.ini" "${php_layer_dir}/config/"
   "${bp_dir}"/bin/install-extensions
-  cat >"${extensions_layer_dir}.toml" <<EOL
+fi
+cat >"${extensions_layer_dir}.toml" <<EOL
 [types]
 cache = true
 build = true
@@ -63,7 +64,6 @@ launch = true
 [metadata]
 version = "${local_extensions_checksum}"
 EOL
-fi
 
 # Compares previous composer.json checksum to the current composer.json
 vendor_layer_dir="${layers_dir}/vendor"
@@ -87,7 +87,8 @@ else
     rm "${vendor_layer_dir:?}/*" -rf
     cp -r vendor/. "${vendor_layer_dir}/"
   fi
-  cat >"${vendor_layer_dir}.toml" <<EOL
+fi
+cat >"${vendor_layer_dir}.toml" <<EOL
 [types]
 cache = true
 build = true
@@ -96,7 +97,6 @@ launch = true
 [metadata]
 version = "${local_composer_checksum}"
 EOL
-fi
 
 echo "---> Config nginx"
 nginx_layer_dir="${layers_dir}/nginx"

buildpacks/python/bin/build

@@ -51,14 +51,7 @@ if [ "${PIP_EXTRA_INDEX_URL}" ]; then
   python -m pip config set global.extra-index-url "${PIP_EXTRA_INDEX_URL}"
 fi
 
-if [[ -f requirements.txt && "${local_requirements_checksum}" == "${remote_requirements_checksum}" ]]; then
-  echo "---> Reusing requirements"
-elif [[ -f requirements.txt ]]; then
-  echo "---> Installing requirements with pip"
-  python -m pip install -r requirements.txt \
-    --exists-action=w --src="${python_layer_dir}"/src \
-    --disable-pip-version-check --no-cache-dir
-  cat >"${requirements_layer_dir}.toml" <<EOL
+cat >"${requirements_layer_dir}.toml" <<EOL
 [types]
 cache = true
 build = true
@@ -67,6 +60,13 @@ launch = true
 [metadata]
 version = "${local_requirements_checksum}"
 EOL
+if [[ -f requirements.txt && "${local_requirements_checksum}" == "${remote_requirements_checksum}" ]]; then
+  echo "---> Reusing requirements"
+elif [[ -f requirements.txt ]]; then
+  echo "---> Installing requirements with pip"
+  python -m pip install -r requirements.txt \
+    --exists-action=w --src="${python_layer_dir}"/src \
+    --disable-pip-version-check --no-cache-dir
   scanelp "${python_layer_dir}" > .auto-deps
   generate_deps_layer auto-deps
 fi

buildpacks/ruby/bin/build

@@ -34,7 +34,11 @@ if [[ -f Gemfile.lock && "${local_bundler_checksum}" == "${remote_bundler_checks
   echo "---> Reusing gems"
 else
   echo "---> Installing gems"
-  cat >"${bundler_layer_dir}.toml" <<EOL
+  bundle install
+  scanelp "${bundler_layer_dir}" > .auto-deps
+  generate_deps_layer auto-deps
+fi
+cat >"${bundler_layer_dir}.toml" <<EOL
 [types]
 cache = true
 build = true
@@ -43,9 +47,5 @@ launch = true
 [metadata]
 version = "${local_bundler_checksum}"
 EOL
-  bundle install
-  scanelp "${bundler_layer_dir}" > .auto-deps
-  generate_deps_layer auto-deps
-fi
 
 generate-launch.sh "${layers_dir}"

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

@@ -82,8 +82,8 @@ generate_deps_layer() {
             mkdir -p "${deps_layer_dir}"
             _install_deps "${deps_file}" "${deps_layer_dir}"
             _create_deps_profile "${deps_layer_dir}"
-            _create_deps_metadata "${deps_type}"
         fi
+        _create_deps_metadata "${deps_type}"
         # shellcheck source=/dev/null
         . "${deps_layer_dir}/profile.d/deps.sh"
     else
@@ -104,14 +104,16 @@ generate_stack_layer() {
     if [[ -f "${stack_layer_dir}.toml" ]]; then
         remote_stack_version=$(yj <"${stack_layer_dir}.toml" -t | jq -r .metadata.version 2>/dev/null || echo 'not found')
     fi
+
     if [[ "${stack_version}" == "${remote_stack_version}" ]]; then
         echo "---> Reusing ${stack_name} ${stack_version}"
     else
         echo "---> Downloading and extracting ${stack_name} ${stack_version}"
         export LAYERS_DIR=${layers_dir}
         export STACK_NAME=${stack_name}
         install-stack "${stack_name}" "${stack_version}"
-        cat >"${stack_layer_dir}.toml" <<EOL
+    fi
+    cat >"${stack_layer_dir}.toml" <<EOL
 [types]
 cache = true
 build = true
@@ -120,7 +122,7 @@ launch = ${launch}
 [metadata]
 version = "${stack_version}"
 EOL
-    fi
+
 }
 
 generate_base_layer