Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[master] deb, rpm: reduce uses of "cd", "popd", "pushd" #1157

Merged
merged 1 commit into from
Jan 24, 2025

Conversation

thaJeztah
Copy link
Member

For make commands, we can just pass the directory through "-C", and for "install" we can pass the full path of the source.

There's some remaining uses for targets that build through a script or using "go build", which may still require changing.

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

For make commands, we can just pass the directory through "-C", and for
"install" we can pass the full path of the source.

There's some remaining uses for targets that build through a script
or using "go build", which may still require changing.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah self-assigned this Jan 24, 2025
pushd ${RPM_BUILD_DIR}/src/compose
make VERSION=%{_compose_version} DESTDIR=./bin build
popd
make -C ${RPM_BUILD_DIR}/src/compose VERSION=%{_compose_version} DESTDIR=./bin build
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hope that DESTDIR works here 🤔

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like it worked;

Complete!
+ verify_binaries
+ docker --version
Docker version 0.0.0-20250124134141-b8879a4, build b8879a4
+ docker buildx version
github.com/docker/buildx v0.20.1 245093b
+ docker compose version
Docker Compose version v2.32.4
+ dockerd --version
Docker version 0.0.0-20250124134141-b8879a4, build 433e9a5
+ docker-proxy --version
docker-proxy (commit 433e9a5) version 0.0.0-20250124134141-b8879a4
+ containerd --version
containerd containerd.io 1.7.25 bcc810d6b9066471b0b6fa75f557a15a1cbf31bb
+ ctr --version
ctr containerd.io 1.7.25
+ containerd-shim -v
containerd-shim
  Version:  1.7.25
  Revision: bcc810d6b9066471b0b6fa75f557a15a1cbf31bb
  Go version: go1.22.10

+ containerd-shim-runc-v1 -v
containerd-shim-runc-v1:
  Version:  1.7.25
  Revision: bcc810d6b9066471b0b6fa75f557a15a1cbf31bb
  Go version: go1.22.10

+ containerd-shim-runc-v2 -v
containerd-shim-runc-v2:
  Version:  1.7.25
  Revision: bcc810d6b9066471b0b6fa75f557a15a1cbf31bb
  Go version: go1.22.10

+ runc --version
runc version 1.2.4
commit: v1.2.4-0-g6c52b3f
spec: 1.2.0
go: go1.22.10
libseccomp: 2.5.5

@thaJeztah thaJeztah merged commit 2f96f03 into docker:master Jan 24, 2025
8 checks passed
@thaJeztah thaJeztah deleted the nopop branch January 24, 2025 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants