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.

Sign up for GitHub

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

Jump to bottom

[23.05] docker-compose: cherry-pick patches to fix starting containers using a local socket #245782

Merged
merged 1 commit into from
Jul 31, 2023
Merged

[23.05] docker-compose: cherry-pick patches to fix starting containers using a local socket #245782

merged 1 commit into from
Jul 31, 2023

Conversation

LeSuisse
Copy link
Contributor

@LeSuisse LeSuisse commented Jul 27, 2023 •
edited
Loading

Description of changes

See #244159.

Cherry-picked the two patches needed to make it compile and work as expected.

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/)
  • 23.11 Release Notes (or backporting 23.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
  • Fits CONTRIBUTING.md.

Result of nixpkgs-review pr 245782 run on x86_64-linux 1

21 packages built:
  • apptainer
  • apptainer-overriden-nixos
  • apx
  • charliecloud
  • docker (docker_20_10)
  • docker-client
  • docker-client.man
  • docker-compose
  • docker-gc
  • docker.man (docker_20_10.man)
  • fn-cli
  • nvidia-docker
  • pipework
  • python310Packages.jupyter-repo2docker
  • python310Packages.jupyter-repo2docker.dist
  • python311Packages.jupyter-repo2docker
  • python311Packages.jupyter-repo2docker.dist
  • singularity
  • singularity-overriden-nixos
  • udocker
  • udocker.dist

@LeSuisse
docker-compose: cherry-pick patches to fix starting containers using …
033018e 
…a local socket

See NixOS#244159.

Cherry-picked the two patches needed to make it compile and work as
expected.
@LeSuisse LeSuisse changed the title docker-compose: cherry-pick patches to fix starting containers using a local socket [23.05] docker-compose: cherry-pick patches to fix starting containers using a local socket Jul 27, 2023
@LeSuisse LeSuisse mentioned this pull request Jul 27, 2023
Closed
@n8henrie
Copy link
Contributor

Working for me.

@multun
Copy link
Member

multun commented Jul 31, 2023

Tested, works for me

@LeSuisse LeSuisse merged commit 79aaf37 into NixOS:release-23.05 Jul 31, 2023
11 of 12 checks passed
@LeSuisse LeSuisse deleted the docker-compose-go-1.20.6 branch July 31, 2023 12:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mikroskeem mikroskeem mikroskeem approved these changes

@babariviere babariviere Awaiting requested review from babariviere

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 12.approvals: 3+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@LeSuisse @n8henrie @multun @mikroskeem