Skip to content

Commit

Permalink
feat: remove bpftool/bpftrace and add nc/jq to retina-shell image (#961)
Browse files Browse the repository at this point in the history
# Description

* bpftool/bpftrace don't work from inside the container, so remove them
from the image.
* nc is useful for testing TCP connectivity, so add it.
* jq is useful for parsing IMDS output, so add it too.

## Related Issue

#910

## Checklist

- [x] I have read the [contributing
documentation](https://retina.sh/docs/contributing).
- [x] I signed and signed-off the commits (`git commit -S -s ...`). See
[this
documentation](https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification)
on signing commits.
- [x] I have correctly attributed the author(s) of the code.
- [x] I have tested the changes locally.
- [x] I have followed the project's style guidelines.
- [ ] I have updated the documentation, if necessary.
- [ ] I have added tests, if applicable.

## Screenshots (if applicable) or Testing Completed

<img width="962" alt="image"
src="https://github.com/user-attachments/assets/9864282f-e31b-43b5-8168-a7988c698b86">
<img width="477" alt="image"
src="https://github.com/user-attachments/assets/75fcb8e1-18e6-482a-bd85-07143a093cd8">


## Additional Notes

Add any additional notes or context about the pull request here.

---

Please refer to the [CONTRIBUTING.md](../CONTRIBUTING.md) file for more
information on how to contribute to this project.

Signed-off-by: Will Daly <[email protected]>
  • Loading branch information
wedaly authored Nov 7, 2024
1 parent 90e47fb commit 5552182
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions shell/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ FROM mcr.microsoft.com/azurelinux/base/core@sha256:7ec490b605aac8a44aed0b0695b0e
# This will be fixed by https://github.com/microsoft/SymCrypt-OpenSSL/pull/92
RUN tdnf install -y \
bind-utils \
bpftool \
bpftrace \
conntrack \
curl \
ebtables-legacy \
Expand All @@ -18,10 +16,12 @@ RUN tdnf install -y \
ipset \
iptables \
iputils \
jq \
ldns-utils \
net-tools \
nftables \
nmap \
nmap-ncat \
openssh \
socat \
tcpdump \
Expand Down

0 comments on commit 5552182

Please sign in to comment.