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

docker images: Add container utilities #2829

Merged
merged 3 commits into from
Nov 8, 2022
Merged

docker images: Add container utilities #2829

merged 3 commits into from
Nov 8, 2022

Conversation

jschaul
Copy link
Member

@jschaul jschaul commented Nov 7, 2022

Checklist

  • Add a new entry in an appropriate subdirectory of changelog.d
  • Read and follow the PR guidelines

@jschaul jschaul requested a review from akshaymankar November 7, 2022 15:46
@jschaul jschaul temporarily deployed to cachix November 7, 2022 15:46 Inactive
@zebot zebot added the ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist label Nov 7, 2022
@jschaul jschaul requested review from sysvinit and smatting November 7, 2022 17:42
flokli
flokli reviewed Nov 7, 2022
View reviewed changes
Copy link
Contributor

@flokli flokli left a comment

Choose a reason for hiding this comment

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

It's very hard to see what this PR is actually changing. Can you move the code formatting into a separate commit?

@jschaul
Copy link
Member Author

jschaul commented Nov 7, 2022

It's very hard to see what this PR is actually changing. Can you move the code formatting into a separate commit?

sorry I can't easily, as my editor now reformats nix code. Perhaps we should include a formatter for nix code in wire-server, and reformat all nix code once, to not have this issue going forward.

But you can tick "Hide Whitespace" here:

whitespace

@jschaul jschaul force-pushed the container-utilities branch from 132c1bd to cab2a6e Compare November 8, 2022 11:33
@jschaul jschaul temporarily deployed to cachix November 8, 2022 11:33 Inactive
@jschaul jschaul force-pushed the container-utilities branch from cab2a6e to 87b769e Compare November 8, 2022 11:40
@jschaul jschaul temporarily deployed to cachix November 8, 2022 11:40 Inactive
@jschaul
Copy link
Member Author

jschaul commented Nov 8, 2022

Rebased, no reformatting anymore.

@flokli
Copy link
Contributor

flokli commented Nov 8, 2022

Check #2831, which ensures .nix code is consistently formatted.

@jschaul jschaul merged commit 2fd21d7 into develop Nov 8, 2022
@jschaul jschaul deleted the container-utilities branch November 8, 2022 13:23
supersven pushed a commit that referenced this pull request Nov 22, 2022
@jschaul @supersven
docker images: Add debug utilities (#2829)
4409619 
* Add debugtools to wire-server images

* changelog

* convenience makefile target for local image building
This was referenced Nov 25, 2022
Closed
Closed
Closed
Merged
Merged
@zebot zebot mentioned this pull request Jan 12, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flokli flokli flokli approved these changes

@akshaymankar akshaymankar Awaiting requested review from akshaymankar

@sysvinit sysvinit Awaiting requested review from sysvinit

@smatting smatting Awaiting requested review from smatting

Assignees
No one assigned
Labels
ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jschaul @flokli @zebot