Skip to content

dockerTools.buildImage: Add copyToRoot to replace contents, explain usage#179801

Merged
roberth merged 1 commit intoNixOS:masterfrom
hercules-ci:fix-footgun-dockerTools-buildImage-contents
Jul 7, 2022
Merged

dockerTools.buildImage: Add copyToRoot to replace contents, explain usage#179801
roberth merged 1 commit intoNixOS:masterfrom
hercules-ci:fix-footgun-dockerTools-buildImage-contents

Conversation

@roberth
Copy link
Copy Markdown
Member

@roberth roberth commented Jul 1, 2022

Description of changes

Remove a footgun.

Fixes #94636

Note that buildLayeredImage/streamLayeredImage do not suffer from this problem, because they already have a different interpretation of contents, adding them to symlinkJoin.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation labels Jul 1, 2022
@roberth roberth mentioned this pull request Jul 1, 2022
Closed
@FRidh FRidh mentioned this pull request Jul 1, 2022
Open
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jul 1, 2022
@roberth roberth force-pushed the fix-footgun-dockerTools-buildImage-contents branch from 8e5b03e to e007eb4 Compare July 6, 2022 05:30
@roberth roberth merged commit 613e768 into NixOS:master Jul 7, 2022
nlewo added a commit to nlewo/nix2container that referenced this pull request Jul 11, 2022
@nlewo
Rename contents to copyToRoot
26d12b5 
Since the nix2container beginning, the nix2container contents behavior
differed from the dockerTools.buildImage behavior.

See NixOS/nixpkgs#179801 for details.
@nlewo nlewo mentioned this pull request Jul 11, 2022
Merged
nlewo added a commit to nlewo/nix2container that referenced this pull request Jul 11, 2022
@nlewo
Rename contents to copyToRoot
5917586 
Since the nix2container beginning, the nix2container contents behavior
differed from the dockerTools.buildImage behavior.

See NixOS/nixpkgs#179801 for details.
nlewo added a commit to nlewo/nix2container that referenced this pull request Jul 16, 2022
@nlewo
Rename contents to copyToRoot
05d3569 
Since the nix2container beginning, the nix2container contents behavior
differed from the dockerTools.buildImage behavior.

See NixOS/nixpkgs#179801 for details.
nlewo added a commit to nlewo/nix2container that referenced this pull request Jul 16, 2022
@nlewo
Rename contents to copyToRoot
db3c83d 
Since the nix2container beginning, the nix2container contents behavior
differed from the dockerTools.buildImage behavior.

See NixOS/nixpkgs#179801 for details.
@W1M0R W1M0R mentioned this pull request Feb 17, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nlewo nlewo nlewo approved these changes

Assignees

No one assigned

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

dockerTools.buildImage layers are 2x too big

2 participants

@roberth @nlewo