Make docker and docker-compose work on WSL2 #1375
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
achantavy
force-pushed
the
dockercomposefixes
branch
from
76f1393 to
419f742
Compare
Signed-off-by: Alex Chantavy <[email protected]>
Signed-off-by: Alex Chantavy <[email protected]>
Signed-off-by: Alex Chantavy <[email protected]>
achantavy
force-pushed
the
dockercomposefixes
branch
from
402910c to
3cbb6c9
Compare
Signed-off-by: Alex Chantavy <[email protected]>
Signed-off-by: Alex Chantavy <[email protected]>
Signed-off-by: Alex Chantavy <[email protected]>
Signed-off-by: Alex Chantavy <[email protected]>
Signed-off-by: Alex Chantavy <[email protected]>
achantavy
changed the title
achantavy
commented
Nov 3, 2024
| @@ -16,11 +16,13 @@ | |||
| from tests.data.github.rate_limit import RATE_LIMIT_RESPONSE_JSON | |||
|
|
|||
|
|
|||
| @patch('cartography.intel.github.util.time.sleep') | |||
There was a problem hiding this comment.
Unrelated to this change, but this was wrong for a while and added 2 extra seconds to each test unncessarily
achantavy
commented
Nov 3, 2024
| interval: 10s | ||
| timeout: 10s | ||
| retries: 10 | ||
|
|
||
| # Runs the standard cartography image available at ghcr.io. | ||
| cartography: | ||
| image: ghcr.io/lyft/cartography:latest | ||
| image: ghcr.io/cartography-cncf/cartography:latest | ||
| platform: linux/x86_64 |
There was a problem hiding this comment.
This is needed for M* Macs.
achantavy
commented
Nov 3, 2024
| @@ -34,14 +33,15 @@ services: | |||
| # Networking: | |||
| - dbms.connector.bolt.listen_address=0.0.0.0:7687 | |||
| healthcheck: | |||
| test: ["CMD", "curl", "-f", "http://localhost:7474"] | |||
| test: ["CMD", "wget", "--no-verbose", "http://localhost:7474"] | |||
There was a problem hiding this comment.
wget works better than curl in reporting health for some reason. curl would get stuck on 'starting' status.
hanzo
approved these changes
Nov 5, 2024
chandanchowdhury
pushed a commit
to chandanchowdhury/cartography
that referenced
this pull request
Nov 27, 2024
### Summary > Describe your changes. Fixes the docker-compose steps to work on WSL2 (Windows Subsystem for Linux 2) and OSX. Updates documentation to use the new cncf tag when building the container. docker-compose is very helpful for dev setups and trying out cartography. ### Checklist ### Testing performed I started with a fresh clone of this branch and on _both_ OSX and WSL2ran 1. `docker build -t cartography-cncf/cartography-dev -f dev.Dockerfile ./` 1. `docker-compose run cartography-dev make test` I can confirm that both paths worked and ran the full test suite using docker-compose. #### WSL2 Linter:  Unit tests:  Integration tests:  #### OSX Linter: <img width="1000" alt="Screenshot 2024-11-03 at 12 29 49 AM" src="https://github.com/user-attachments/assets/e7840c2a-8065-4163-8057-3de902532291"> Unit tests: <img width="997" alt="Screenshot 2024-11-03 at 12 30 07 AM" src="https://github.com/user-attachments/assets/11d91723-776c-4438-b2a1-fe783e75e414"> Integration tests: <img width="1003" alt="Screenshot 2024-11-03 at 12 30 22 AM" src="https://github.com/user-attachments/assets/c2360ad5-a2c2-4309-91d0-1080dc9d0bb3"> --------- Signed-off-by: Alex Chantavy <[email protected]> Signed-off-by: chandanchowdhury <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Fixes the docker-compose steps to work on WSL2 (Windows Subsystem for Linux 2) and OSX. Updates documentation to use the new cncf tag when building the container.
docker-compose is very helpful for dev setups and trying out cartography.
Checklist
Testing performed
I started with a fresh clone of this branch and on both OSX and WSL2ran
docker build -t cartography-cncf/cartography-dev -f dev.Dockerfile ./docker-compose run cartography-dev make testI can confirm that both paths worked and ran the full test suite using docker-compose.
WSL2
Linter:
Unit tests:
Integration tests:
OSX
Linter:
Unit tests:
Integration tests:
