bump compose version to v2.24.0

[jhrotko]

No description provided.

[glours]

@thaJeztah we closed the previous PR as it wasn't a fork branch and @jhrotko didn't have the right to push force to the branch the signed commit, can you please review this one?

[glours]

LGTM

[thaJeztah]

Weird; something is failing in Jenkins; looks like it fails to checkout the branch for some reason 🤔

+ make REF=bump-compose-2.24.0 raspbian-bookworm
git init src/github.com/docker/cli
Initialized empty Git repository in /home/ubuntu/workspace/docker-ce-packaging_PR-977/src/github.com/docker/cli/.git/
git -C src/github.com/docker/cli remote add origin "https://github.com/docker/cli.git"
./scripts/checkout.sh src/github.com/docker/cli "bump-compose-2.24.0"
+ SRC=src/github.com/docker/cli
+ REF=bump-compose-2.24.0
+ REF_FETCH=bump-compose-2.24.0
+ git -C src/github.com/docker/cli ls-remote --refs --heads --tags origin bump-compose-2.24.0
+ awk {print $2}
+ REF=
+ [ -n  ]
+ REF=FETCH_HEAD
+ git -C src/github.com/docker/cli fetch --update-head-ok --depth 1 origin bump-compose-2.24.0
fatal: couldn't find remote ref bump-compose-2.24.0
make: *** [Makefile:50: checkout-cli] Error 128
script returned exit code 2

[thaJeztah]

Wait... it's trying to checkout bump-compose-2.24.0 in the CLI repository???? how the ... does that happen?

git -C src/github.com/docker/cli remote add origin "https://github.com/docker/cli.git"
./scripts/checkout.sh src/github.com/docker/cli "bump-compose-2.24.0"

[thaJeztah]

wondering if it’s some env-var (REF) that’s too generic and inherited somewhere 🤔

[thaJeztah]

Looking at older PR runs, REF would use the target branch (master);

[thaJeztah]

Maybe it gets confused because the old "wrong" branch still exists in this repository; I'll try deleting that one (but looks like branch protections blocks removing it 😂 )

[thaJeztah]

OH!!! the problem was in plain sight! But it revealed itself when I removed that stray branch; I see this PR was targeting that stray branch, not master

I can do a quick PR to replace this one

[thaJeztah]

• opened [master] bump compose version to v2.24.0 #978

Minor nit; @jhrotko it looks like you have your git configured without your "real name";

Signed-off-by: jhrotko <[email protected]>

technically, DCO sign-off require to use your full name (see https://github.com/docker/cli/blob/master/CONTRIBUTING.md#sign-your-work);

Signed-off-by: YourFirsName YourLastName <[email protected]>

Steps to do so "roughly" come down to:

git config --global user.name "YourFirstName YourLastName"
git config --global user.email "[email protected]"

After that, signing off (-s / --signoff) should use the details your configured above.

[thaJeztah]

☝️ Also; Pro-Tip: you can configure your upstream remote to use an invalid push URL; that way it's not possible to push to upstream (unless you specify the URL to push to)

All my github forks looks like this;

git remote -v
origin	https://github.com/thaJeztah/docker-ce-packaging.git (fetch)
origin	https://github.com/thaJeztah/docker-ce-packaging.git (push)
upstream	https://github.com/docker/docker-ce-packaging.git (fetch)
upstream	no_pushing (push)

Configure using;

git remote set-url --push upstream no_pushing

It's a bit of a hack, but it definitely saved me from some accidental pushes when I wasn't paying attention. With the that hack, if you try to push to upstream, it will fail (invalid URL)