From 9278e17560928cca1774f1a0e866e7ab482faccc Mon Sep 17 00:00:00 2001 From: Aidan Delaney Date: Fri, 3 Nov 2023 08:14:18 +0000 Subject: [PATCH] Uncompress the nodejs archive Ensure that we uncompress the downloaded archive Signed-off-by: Aidan Delaney --- .../create-buildpack/adding-bill-of-materials.md | 4 ++-- .../docs/buildpack-author-guide/create-buildpack/build-app.md | 4 ++-- .../docs/buildpack-author-guide/create-buildpack/caching.md | 4 ++-- .../create-buildpack/make-app-runnable.md | 2 +- .../create-buildpack/make-buildpack-configurable.md | 2 +- .../create-buildpack/specify-multiple-process-types.md | 2 +- .../buildpack-author-guide/adding-bill-of-materials.md | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/content/docs/buildpack-author-guide/create-buildpack/adding-bill-of-materials.md b/content/docs/buildpack-author-guide/create-buildpack/adding-bill-of-materials.md index de9e0500f..48a0632f2 100644 --- a/content/docs/buildpack-author-guide/create-buildpack/adding-bill-of-materials.md +++ b/content/docs/buildpack-author-guide/create-buildpack/adding-bill-of-materials.md @@ -135,9 +135,9 @@ mkdir -p "${node-js_layer}" # 3. DOWNLOAD node-js node-js_version=$(cat "$plan" | yj -t | jq -r '.entries[] | select(.name == "node-js") | .metadata.version') -echo "---> Downloading and extracting NodeJS $node-js_version" +echo "---> Downloading and extracting NodeJS" node-js_url=https://nodejs.org/dist/v18.18.1/node-v18.18.1-linux-x64.tar.xz -wget -q -O - "$node-js_url" | tar -xzf - -C "${node-js_layer}" +wget -q -O - "$node-js_url" | tar -xxf - -C "${node-js_layer}" # 4. MAKE node-js AVAILABLE DURING LAUNCH echo -e '[types]\nlaunch = true' > "${layersdir}/node-js.toml" diff --git a/content/docs/buildpack-author-guide/create-buildpack/build-app.md b/content/docs/buildpack-author-guide/create-buildpack/build-app.md index 56dafe483..c1f964694 100644 --- a/content/docs/buildpack-author-guide/create-buildpack/build-app.md +++ b/content/docs/buildpack-author-guide/create-buildpack/build-app.md @@ -39,7 +39,7 @@ Next, we'll download the NodeJS runtime and install it into the layer directory. ```bash echo "---> Downloading and extracting NodeJS" node_js_url=https://nodejs.org/dist/v18.18.1/node-v18.18.1-linux-x64.tar.xz -wget -q -O - "${node_js_url}" | tar -xf - -C "${node_js_layer}" +wget -q -O - "${node_js_url}" | tar -xJf - -C "${node_js_layer}" ``` This code uses the `wget` tool to download the NodeJS binaries from the given URL, and extracts it to the `node_js_layer` directory. @@ -74,7 +74,7 @@ mkdir -p "${node_js_layer}" # 3. DOWNLOAD node-js echo "---> Downloading and extracting NodeJS" node_js_url=https://nodejs.org/dist/v18.18.1/node-v18.18.1-linux-x64.tar.xz -wget -q -O - "${node_js_url}" | tar -xf - -C "${node_js_layer}" +wget -q -O - "${node_js_url}" | tar -xJf - -C "${node_js_layer}" # 4. MAKE node-js AVAILABLE DURING LAUNCH echo -e '[types]\nlaunch = true' > "${layersdir}/node-js.toml" diff --git a/content/docs/buildpack-author-guide/create-buildpack/caching.md b/content/docs/buildpack-author-guide/create-buildpack/caching.md index 3f8e93c41..4016d640a 100644 --- a/content/docs/buildpack-author-guide/create-buildpack/caching.md +++ b/content/docs/buildpack-author-guide/create-buildpack/caching.md @@ -42,7 +42,7 @@ mkdir -p "${node_js_layer}" # 3. DOWNLOAD RUBY echo "---> Downloading and extracting NodeJS" node_js_url=https://nodejs.org/dist/v18.18.1/node-v18.18.1-linux-x64.tar.xz -wget -q -O - "$node_js_url" | tar -xzf - -C "${node_js_layer}" +wget -q -O - "$node_js_url" | tar -xJf - -C "${node_js_layer}" # 4. MAKE RUBY AVAILABLE DURING LAUNCH echo -e '[types]\nlaunch = true' > "${layersdir}/node-js.toml" @@ -189,7 +189,7 @@ mkdir -p "${node_js_layer}" # 3. DOWNLOAD RUBY echo "---> Downloading and extracting NodeJS" node_js_url=https://nodejs.org/dist/v18.18.1/node-v18.18.1-linux-x64.tar.xz -wget -q -O - "$node_js_url" | tar -xzf - -C "${node_js_layer}" +wget -q -O - "$node_js_url" | tar -xJf - -C "${node_js_layer}" # 4. MAKE RUBY AVAILABLE DURING LAUNCH echo -e '[types]\nlaunch = true' > "${layersdir}/node-js.toml" diff --git a/content/docs/buildpack-author-guide/create-buildpack/make-app-runnable.md b/content/docs/buildpack-author-guide/create-buildpack/make-app-runnable.md index b9b3077ea..618b75e0f 100644 --- a/content/docs/buildpack-author-guide/create-buildpack/make-app-runnable.md +++ b/content/docs/buildpack-author-guide/create-buildpack/make-app-runnable.md @@ -41,7 +41,7 @@ mkdir -p "${node_js_layer}" # 3. DOWNLOAD node-js echo "---> Downloading and extracting NodeJS" node_js_url=https://nodejs.org/dist/v18.18.1/node-v18.18.1-linux-x64.tar.xz -wget -q -O - "$node_js_url" | tar -xzf - -C "${node_js_layer}" +wget -q -O - "$node_js_url" | tar -xJf - -C "${node_js_layer}" # 4. MAKE node-js AVAILABLE DURING LAUNCH echo -e '[types]\nlaunch = true' > "${layersdir}/node-js.toml" diff --git a/content/docs/buildpack-author-guide/create-buildpack/make-buildpack-configurable.md b/content/docs/buildpack-author-guide/create-buildpack/make-buildpack-configurable.md index 5f29010cd..f7f4f1cab 100644 --- a/content/docs/buildpack-author-guide/create-buildpack/make-buildpack-configurable.md +++ b/content/docs/buildpack-author-guide/create-buildpack/make-buildpack-configurable.md @@ -60,7 +60,7 @@ mkdir -p "${node_js_layer}" node_js_version=$(cat "$plan" | yj -t | jq -r '.entries[] | select(.name == "node-js") | .metadata.version') echo "---> Downloading and extracting NodeJS $node_js_version" node_js_url=https://nodejs.org/dist/v${node_js_version}/node-v${node_js_version}-linux-x64.tar.xz -wget -q -O - "$node_js_url" | tar -xzf - -C "${node_js_layer}" +wget -q -O - "$node_js_url" | tar -xJf - -C "${node_js_layer}" # 4. MAKE node-js AVAILABLE DURING LAUNCH echo -e '[types]\nlaunch = true' > "${layersdir}/node-js.toml" diff --git a/content/docs/buildpack-author-guide/create-buildpack/specify-multiple-process-types.md b/content/docs/buildpack-author-guide/create-buildpack/specify-multiple-process-types.md index 2d4a6820b..d094d0f58 100644 --- a/content/docs/buildpack-author-guide/create-buildpack/specify-multiple-process-types.md +++ b/content/docs/buildpack-author-guide/create-buildpack/specify-multiple-process-types.md @@ -47,7 +47,7 @@ mkdir -p "${node_js_layer}" # 3. DOWNLOAD node-js echo "---> Downloading and extracting NodeJS" node_js_url=https://nodejs.org/dist/v18.18.1/node-v18.18.1-linux-x64.tar.xz -wget -q -O - "$node_js_url" | tar -xzf - -C "${node_js_layer}" +wget -q -O - "$node_js_url" | tar -xJf - -C "${node_js_layer}" # 4. MAKE node-js AVAILABLE DURING LAUNCH echo -e '[types]\nlaunch = true' > "${layersdir}/node-js.toml" diff --git a/katacoda/scenarios/buildpack-author-guide/adding-bill-of-materials.md b/katacoda/scenarios/buildpack-author-guide/adding-bill-of-materials.md index 6f17d9dde..63bad20fd 100644 --- a/katacoda/scenarios/buildpack-author-guide/adding-bill-of-materials.md +++ b/katacoda/scenarios/buildpack-author-guide/adding-bill-of-materials.md @@ -133,7 +133,7 @@ mkdir -p "$rubylayer" ruby_version=$(cat "$plan" | yj -t | jq -r '.entries[] | select(.name == "ruby") | .metadata.version') echo "---> Downloading and extracting Ruby $ruby_version" ruby_url=https://s3-external-1.amazonaws.com/heroku-buildpack-ruby/heroku-22/ruby-$ruby_version.tgz -wget -q -O - "$ruby_url" | tar -xzf - -C "$rubylayer" +wget -q -O - "$ruby_url" | tar -xJf - -C "$rubylayer" # 4. MAKE RUBY AVAILABLE DURING LAUNCH echo -e '[types]\nlaunch = true' > "$layersdir/ruby.toml"