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.

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

💫 Add possibility to use makefile with docker-compose and docker compose #3485

Merged
merged 3 commits into from
Feb 16, 2023

Conversation

LePetitTim
Copy link
Contributor

No description provided.

@cypress
Copy link

cypress bot commented Feb 16, 2023

Passing run #5947 ↗︎

0 24 0 0 Flakiness 0

Details:

Merge 0d99ecc into c2c5e71...
Project: Geotrek-admin Commit: dcb33a7644 ℹ️
Status: Passed Duration: 03:29 💡
Started: Feb 16, 2023 2:55 PM Ended: Feb 16, 2023 2:58 PM

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.

@codecov
Copy link

codecov bot commented Feb 16, 2023

Codecov Report

Base: 98.28% // Head: 98.28% // Decreases project coverage by -0.01% ⚠️

Coverage data is based on head (0d99ecc) compared to base (f426683).
Patch has no changes to coverable lines.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3485      +/-   ##
==========================================
- Coverage   98.28%   98.28%   -0.01%     
==========================================
  Files         292      292              
  Lines       21201    21279      +78     
==========================================
+ Hits        20838    20914      +76     
- Misses        363      365       +2     
Impacted Files Coverage Δ
geotrek/common/forms.py 98.97% <0.00%> (-0.68%) ⬇️
geotrek/feedback/views.py 100.00% <0.00%> (ø)
geotrek/feedback/parsers.py 100.00% <0.00%> (ø)
geotrek/common/utils/testdata.py 100.00% <0.00%> (ø)
geotrek/common/models.py 99.56% <0.00%> (+0.06%) ⬆️
geotrek/common/parsers.py 93.19% <0.00%> (+0.10%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@LePetitTim LePetitTim changed the title 💫 Add posibility to use makefile directly on jammy jellyfish 💫 Add posibility to use makefile with docker-compose and docker compose Feb 16, 2023
docker-compose "$@"
docker compose "$@"
function docker_compose {
# use docker-compose then fallback to new docker compose
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# use docker-compose then fallback to new docker compose

Copy link
Member

Choose a reason for hiding this comment

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

delete this comment

@submarcos submarcos changed the title 💫 Add posibility to use makefile with docker-compose and docker compose 💫 Add possibility to use makefile with docker-compose and docker compose Feb 16, 2023
@LePetitTim LePetitTim merged commit fd0a6a6 into master Feb 16, 2023
@LePetitTim LePetitTim deleted the fix_makefile_2204 branch February 16, 2023 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants