Skip to content

gitlab-runner: Make Bash a runtime dependency to fix clear-docker-cache.#409109

Merged
leona-ya merged 1 commit intoNixOS:masterfrom
commiterate:fix/gitlab-runner/clear-docker-cache-bash
May 20, 2025
Merged

gitlab-runner: Make Bash a runtime dependency to fix clear-docker-cache.#409109
leona-ya merged 1 commit intoNixOS:masterfrom
commiterate:fix/gitlab-runner/clear-docker-cache-bash

Conversation

@commiterate
Copy link
Contributor

#395906 (comment)

Bash was accidentally moved from a runtime to a build time dependency in a prior PR which broke the clear-docker-cache Bash script output. Moving it back to a runtime dependency.

cat /nix/store/v2zaq82pi58pijfs5xlzx3zhzyv0n6fg-gitlab-runner-17.11.0/bin/clear-docker-cache

#!/nix/store/41pi0jiyvlhxgpfhxzvb44w1skc8yp4z-bash-interactive-5.2p37/bin/bash
# http://redsymbol.net/articles/unofficial-bash-strict-mode/

#########################################################################################
#  SCRIPT: clear-docker-cache.sh
#  Description: Used to cleanup unused docker containers and volumes
######################################################################################
# ...

/nix/store/v2zaq82pi58pijfs5xlzx3zhzyv0n6fg-gitlab-runner-17.11.0/bin/clear-docker-cache help

INFO: Docker installation not found, skipping clear-docker-cache

Needs to be backported to 24.11.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 20, 2025
@leona-ya leona-ya merged commit c78448a into NixOS:master May 20, 2025
19 of 22 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented May 20, 2025

@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented May 20, 2025

Git push to origin failed for release-24.11 with exitcode 1

@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented May 20, 2025

@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented May 20, 2025

Git push to origin failed for release-24.11 with exitcode 1

@nixpkgs-ci nixpkgs-ci bot added the 8.has: port to stable This PR already has a backport to the stable release. label May 20, 2025
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented May 20, 2025

Git push to origin failed for release-25.05 with exitcode 1

1 similar comment
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented May 20, 2025

Git push to origin failed for release-25.05 with exitcode 1

@commiterate commiterate deleted the fix/gitlab-runner/clear-docker-cache-bash branch May 20, 2025 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants