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

Rename docker-compose.yml files #1998

Merged

Conversation

casdal
Copy link
Contributor

@casdal casdal commented Dec 17, 2024

What type of PR is this? (check all applicable)

  • πŸ• Feature
  • πŸ› Bug Fix
  • πŸ“ Documentation
  • πŸ§‘β€πŸ’» Refactor
  • βœ… Test
  • πŸ€– Build or CI
  • ❓ Other (files rename)

Related Issue

Fixes #1769

Describe this PR

Rename docker-compose.yml files and references to them.

[optional] What gif best describes this PR or how it makes you feel?

πŸ˜„

@github-actions github-actions bot added docs Improvements or additions to documentation contrib External contributions, or not related to core functionality labels Dec 17, 2024
@github-actions github-actions bot added the devops Related to deployment or configuration label Dec 17, 2024
@spwoodcock
Copy link
Member

This is great! Thank you πŸ™

I think one small thing might be missing as far as I can tell. Updating the build and deploy github workflow that references docker-compose.{environment}.

We use this for the deploy step =)

@casdal
Copy link
Contributor Author

casdal commented Dec 18, 2024

This is great! Thank you πŸ™

I think one small thing might be missing as far as I can tell. Updating the build and deploy github workflow that references docker-compose.{environment}.

We use this for the deploy step =)

Hi ,
OK right away.

Thank to you btw

@casdal
Copy link
Contributor Author

casdal commented Dec 18, 2024

This is great! Thank you πŸ™

I think one small thing might be missing as far as I can tell. Updating the build and deploy github workflow that references docker-compose.{environment}.

We use this for the deploy step =)

Hi @spwoodcock,

hotosm/gh-workflows#59 (comment)
Is this all the suggested change ?

Shoud I also change references to :

docker-compose.yml
docker-compose.yml
docker-compose.yml

@spwoodcock
Copy link
Member

Apologies @casdal !
I don't think hotosm/gh-workflows requires any changes, except in documentation as you point out πŸ‘

The missing part here is the variable defined in the FMTM usage of the workflows:

docker_compose_file: "docker-compose.${{ github.ref_name }}.yml"

@spwoodcock
Copy link
Member

I also looks like a reference here too that might need updating:

compose_file: docker-compose.yml -f contrib/playwright/docker-compose.yml

@casdal
Copy link
Contributor Author

casdal commented Dec 18, 2024

Apologies @casdal ! I don't think hotosm/gh-workflows requires any changes, except in documentation as you point out πŸ‘

The missing part here is the variable defined in the FMTM usage of the workflows:

docker_compose_file: "docker-compose.${{ github.ref_name }}.yml"

No need to apologies @spwoodcock ,

I shoudl use '--hiden' while grepring πŸ˜…
Thank you so much for the guide, time and patience.

If more work is needed, please just tell me.

@casdal casdal force-pushed the rename-docker-compose.yml-files-#1769 branch 3 times, most recently from 3d4b0c4 to f4d5855 Compare December 18, 2024 19:42
Copy link
Member

@spwoodcock spwoodcock left a comment

Choose a reason for hiding this comment

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

Thank you πŸ™

@spwoodcock spwoodcock merged commit 1b1b1fb into hotosm:development Dec 19, 2024
2 checks passed
@casdal
Copy link
Contributor Author

casdal commented Dec 21, 2024

Thank you to you.

@casdal
Copy link
Contributor Author

casdal commented Dec 21, 2024

I think references in docs: gh-workflows/docker-compose.yml - gh-workflows/docker-compose.yml - gh-workflows/docker-compose.yml need to be updated for reflect the changes made here. There is a PR open on that repo #59

nischalstha9 added a commit that referenced this pull request Dec 23, 2024
Sujanadh pushed a commit that referenced this pull request Dec 23, 2024
* Revert "Merge pull request #2015 from hotosm/fix-backend-test"

This reverts commit 8c1ea52, reversing
changes made to 3e418b5.

* Revert "build: rename docker-compose.yml files --> compose.yml (#1998)"

This reverts commit 1b1b1fb.
@spwoodcock
Copy link
Member

Apologies @casdal , I'm currently on holiday & the team had to revert the changes here temporarily 🫣

I think there is a nested reference to the original filename in one of out github workflows that needs to be changed, before this PR will work.

We will get back to you in the new year!

@casdal
Copy link
Contributor Author

casdal commented Jan 18, 2025

Hi @spwoodcock ,

Apologies @casdal , I'm currently on holiday & the team had to revert the changes here temporarily 🫣

No problem

I think there is a nested reference to the original filename in one of out github workflows that needs to be changed, before this PR will work.

I will investigate, thanks for the hints btw.

spwoodcock pushed a commit that referenced this pull request Jan 30, 2025
* Rename docker-compose.yml files

Signed-off-by: casdal <[email protected]>

* Delete docker-compose.yml files

Signed-off-by: casdal <[email protected]>

* Rename docker files and references to them.

Signed-off-by: casdal <[email protected]>

* Rename references to compose.yaml on github workflows.

Signed-off-by: casdal <[email protected]>

---------

Signed-off-by: casdal <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contrib External contributions, or not related to core functionality devops Related to deployment or configuration docs Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rename docker-compose.yml files --> compose.yaml
2 participants