-
Notifications
You must be signed in to change notification settings - Fork 45
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.
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
ci, dev: remove frontend nginx version, dev stack with bundled front … #10502
base: dev
Are you sure you want to change the base?
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## dev #10502 +/- ##
==========================================
+ Coverage 81.80% 81.82% +0.01%
==========================================
Files 1073 1073
Lines 106604 106829 +225
Branches 730 730
==========================================
+ Hits 87208 87410 +202
- Misses 19357 19380 +23
Partials 39 39
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
0cbd80a
to
26def6a
Compare
2cb59cf
to
7327fa6
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Maybe we should delete the scripts/host-compose.sh
file?
7327fa6
to
cf4852e
Compare
cf4852e
to
9ca9543
Compare
9ca9543
to
46fc9d4
Compare
46fc9d4
to
c1ea288
Compare
96338f2
to
1b70748
Compare
Various updates : the order of the overrides matters more than I thought, so I switched the way I pars env flags. |
1b70748
to
8e8af32
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! ❤️
Only tested and reviewed the script, and it suits my (core debug) need at least as well as before:
./osrd-compose host up -d --build osrdyne osrd-images jaeger gateway postgres valkey rabbitmq && cd editoast && diesel migration run
(then launching aside editoast
no-cache & single-worker + core
single-worker)
Improving a "without-back" dev-ex (no-cache, single-worker, exclude service instead of include) is another topic.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not naming it osrd-compose.sh
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For the sake of brevity
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK.
Oh, forgot about this remark: should we document it in the main readme, then? (I'm OK to do this, once we agree on it, if you prefer)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd rather have it in the documentation than the readme since the instructions in the readme are still properly working for someone that is pulling the repository to start the project locally and we should cover the topic more than just "type this command".
Maybe we should add a page for "starting the development environment" with various scenarios depending on the components you'd like to work on ? Wdyt ?
…by default - Use the gateway-front in the e2e tests - Simplify the integration tests step removing gateway and front images - Use the gateway front image for the front, removing the container front of the default stack - Create a Docker compose for the front devel stack Signed-off-by: Élyse Viard <[email protected]>
8e8af32
to
a88e08a
Compare
The goal of this PR is to simplify the stack by:
Due to a limitation in Docker Compose not supporting targeting custom targets inside other Dockerfile in additional contexts, I've moved a part of the building system for the front on the Gateway Dockerfile. Not ideal, but does the trick.
NOTE : Before merging we should modify the protrected branch requirement