Skip to content

Commit 5dcf56e

Browse files
authored
Merge pull request #1157 from cloudfoundry/cflinuxfs5-beta
feat: Add cflinuxfs5 (Ubuntu 24.04) stack support
2 parents 3724516 + edf74fe commit 5dcf56e

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ log/
55
**/.DS_Store
66
/python_buildpack-*.zip
77
.idea/
8+
build/buildpack.zip

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.8.44
1+
1.9.0

manifest.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ dependencies:
3232
- name: libffi
3333
version: 3.2.1
3434
cf_stacks:
35+
- cflinuxfs5
3536
- cflinuxfs4
3637
- cflinuxfs3
3738
uri: https://buildpacks.cloudfoundry.org/dependencies/manual-binaries/python/libffi-3.2.1-linux-x64-5f5bf32c.tgz
@@ -41,6 +42,7 @@ dependencies:
4142
- name: libmemcache
4243
version: 1.0.18
4344
cf_stacks:
45+
- cflinuxfs5
4446
- cflinuxfs4
4547
- cflinuxfs3
4648
uri: https://buildpacks.cloudfoundry.org/dependencies/manual-binaries/python/libmemcache-1.0.18-linux-x64-6d33aa02.tgz
@@ -70,6 +72,7 @@ dependencies:
7072
uri: https://buildpacks.cloudfoundry.org/dependencies/pip/pip_25.2_linux_noarch_any-stack_7dc1e988.tgz
7173
sha256: 7dc1e9882eb18f53150261c3a0cde7d5a39cdb18843c930ee01db8582f6b4f27
7274
cf_stacks:
75+
- cflinuxfs5
7376
- cflinuxfs4
7477
- cflinuxfs3
7578
source: https://files.pythonhosted.org/packages/20/16/650289cd3f43d5a2fadfd98c68bd1e1e7f2550a1a5326768cddfbcedb2c5/pip-25.2.tar.gz

scripts/install_go.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,23 @@ set -u
55
set -o pipefail
66

77
function main() {
8-
if [[ "${CF_STACK:-}" != "cflinuxfs3" && "${CF_STACK:-}" != "cflinuxfs4" ]]; then
8+
if [[ "${CF_STACK:-}" != "cflinuxfs4" && "${CF_STACK:-}" != "cflinuxfs5" ]]; then
99
echo " **ERROR** Unsupported stack"
1010
echo " See https://docs.cloudfoundry.org/devguide/deploy-apps/stacks.html for more info"
1111
exit 1
1212
fi
1313

1414
local version expected_sha dir
15-
version="1.25.6"
16-
expected_sha="0ed64e3b9cb9b1c2ec57880dae2427b0ee2676f2ae2fb53c2e1bb838c500f9fb"
15+
version="1.25.7"
16+
expected_sha="12a6e116cffdcd071988cf3c30216a3f08f54d2cfbb45fff67e375823fd0c3b9"
1717
dir="/tmp/go${version}"
1818

1919
mkdir -p "${dir}"
2020

2121
if [[ ! -f "${dir}/bin/go" ]]; then
2222
local url
23-
url="https://buildpacks.cloudfoundry.org/dependencies/go/go_${version}_linux_x64_${CF_STACK}_${expected_sha:0:8}.tgz"
23+
# Use cflinuxfs4 binary for all stacks (compatible with cflinuxfs5)
24+
url="https://buildpacks.cloudfoundry.org/dependencies/go/go_${version}_linux_x64_cflinuxfs4_${expected_sha:0:8}.tgz"
2425

2526
echo "-----> Download go ${version}"
2627
curl "${url}" \

scripts/package.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ function package::buildpack() {
9595
stack_flag="--any-stack"
9696
if [[ "${stack}" != "any" ]]; then
9797
stack_flag="--stack=${stack}"
98+
export CF_STACK="${stack}"
9899
fi
99100

100101
local file

0 commit comments

Comments
 (0)