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

Remove zlib dependencies from Docker containers #111939

Merged
merged 3 commits into from
Jan 29, 2025
Merged

Remove zlib dependencies from Docker containers #111939

merged 3 commits into from
Jan 29, 2025

Conversation

carlossanlop
Copy link
Member

Fixes #105373

@carlossanlop carlossanlop self-assigned this Jan 29, 2025
@carlossanlop carlossanlop requested review from a team January 29, 2025 01:55
@jkotas
Copy link
Member

jkotas commented Jan 29, 2025

More places to cleanup:

.devcontainer\android\Dockerfile(24):zlib1g-dev \
.devcontainer\android\Dockerfile(26):zlib1g-dev \
.devcontainer\Dockerfile(27):zlib1g-dev \
.devcontainer\wasm-multiThreaded\Dockerfile(27):zlib1g-dev \
.devcontainer\wasm\Dockerfile(26):zlib1g-dev \
eng\common\cross\build-rootfs.sh(67):__UbuntuPackages+=" zlib1g-dev"

@carlossanlop
Copy link
Member Author

More places to cleanup:

...
eng\common\cross\build-rootfs.sh(67):__UbuntuPackages+=" zlib1g-dev"

eng\common comes from arcade. I'll open a PR in that repo to remove it there.

@carlossanlop
Copy link
Member Author

... Which means that the install-dependencies.sh file should not be modified here.

@carlossanlop carlossanlop mentioned this pull request Jan 29, 2025
Merged
@carlossanlop carlossanlop changed the title Remove zlib dependencies from install-dependencies.sh Remove zlib dependencies from Docker containers Jan 29, 2025
@carlossanlop
Copy link
Member Author

@jkotas @sbomer are the changes in this PR acceptable, or do they also require more work coming from other repos?

sbomer
sbomer approved these changes Jan 29, 2025
View reviewed changes
Copy link
Member

@sbomer sbomer left a comment

Choose a reason for hiding this comment

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

LGTM. These are independent of the arcade changes.

@carlossanlop carlossanlop merged commit 7de730a into dotnet:main Jan 29, 2025
17 checks passed
@carlossanlop carlossanlop deleted the RemoveZlibFromScriptAndInstructions branch January 29, 2025 22:22
grendello added a commit to grendello/runtime that referenced this pull request Jan 30, 2025
@grendello
Merge branch 'main' into dev/grendel/android-clr-host-local
dbeb51b 
* main: (31 commits)
  More native AOT Pri-1 test tree bring up (dotnet#111994)
  Fix BigInteger outerloop test (dotnet#111841)
  JIT: Run 3-opt once across all regions (dotnet#111989)
  JIT: Check for profile consistency throughout JIT backend (dotnet#111684)
  [JIT] Add legacy extended EVEX encoding and EVEX.ND/NF feature to x64 emitter backend (dotnet#108796)
  [iOS][globalization] Fix IndexOf on empty strings on iOS to return -1 (dotnet#111898)
  System.Speech: Use intellisense xml from dotnet-api-docs (dotnet#111983)
  [mono][mini] Disable inlining if we encounter class initialization failure (dotnet#111754)
  [main] Update dependencies from dotnet/roslyn (dotnet#111946)
  Update dependencies from https://github.com/dotnet/arcade build 20250129.2 (dotnet#111996)
  Try changing the ICustomQueryInterface implementation to always return NotHandled instead of Failed to defer back to the ComWrappers impl. (dotnet#111978)
  Combined dependency update (dotnet#111852)
  Replace OPTIMIZE_FOR_SIZE with feature switch (dotnet#111743)
  Fix failed assertion 'FPbased == FPbased2' (dotnet#111787)
  Add remark to `ConditionalSelect` (dotnet#111945)
  JIT: fix try region cloning when try is nested in a handler (dotnet#111975)
  Use IRootFunctions in Tensor.StdDev (dotnet#110641)
  Remove zlib dependencies from Docker containers (dotnet#111939)
  Avoid `Unsafe.As` for `Memory<T>` and `ReadOnlyMemory<T>` conversion (dotnet#111023)
  Cleanup membarrier portability (dotnet#111943)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbomer sbomer sbomer approved these changes

Assignees

@carlossanlop carlossanlop

Labels
area-Infrastructure
Projects
Runtime Infra
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Remove system zlib packages from unix native dependencies
3 participants
@carlossanlop @jkotas @sbomer