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

🔧 Refactor manual-install Compose.yml: Simplify Environment Variables #5393

Closed
wants to merge 6 commits into from

Conversation

flll
Copy link
Collaborator

@flll flll commented Oct 8, 2024

  • Removed explicit values for environment variables in docker-compose.yml.
  • Utilized default values for better flexibility and maintainability.
  • Updated network configuration to use the default bridge driver.

Note: Using network: default is sufficient within Docker Compose; there's no need to create a separate nextcloud-network for all hosts. 🚀

flll added 2 commits October 8, 2024 11:09
- Removed explicit values for environment variables in `docker-compose.yml`.
- Utilized default values for better flexibility and maintainability.
- Updated network configuration to use the default bridge driver.

Note: Using `network: default` is sufficient within Docker Compose; there's no need to create a separate `nextcloud-network` for all hosts. 🚀


Signed-off-by: lll <[email protected]>
Copy link
Collaborator

@docjyJ docjyJ left a comment

Choose a reason for hiding this comment

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

It is a good idea to use the default network!

For the variables, maybe you should rename them in the .env because there is a small error with the REDIS_HOST_PASWORD.

manual-install/latest.yml Outdated Show resolved Hide resolved
manual-install/latest.yml Outdated Show resolved Hide resolved
Copy link
Collaborator

@Zoey2936 Zoey2936 left a comment

Choose a reason for hiding this comment

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

File is created via script: https://github.com/nextcloud/all-in-one/blob/main/manual-install/update-yaml.sh - you need to modify the script not the file

@szaimen szaimen added 2. developing Work in progress enhancement New feature or request labels Oct 8, 2024
flll and others added 3 commits October 13, 2024 10:54
Co-authored-by: Jean-Yves <[email protected]>
Signed-off-by: lll <[email protected]>
Co-authored-by: Jean-Yves <[email protected]>
Signed-off-by: lll <[email protected]>
`update-yaml.sh`の処理の追加を
- .services[].networks の削除
- =%%を削除する特殊な処理

これにより、
すべてのサービスをdefaultのネットワークに接続させることができ、
変数の簡略化が見込めます

Signed-off-by: lll <[email protected]>
@flll
Copy link
Collaborator Author

flll commented Oct 13, 2024

Thank you for your reviews, Zoey2936, docjyJ, and szaimen.

I've made additional changes to the update-yaml.sh script:

  • Removed .services[].networks
  • Added a special process to remove =%%

Additionally, I've corrected the REDIS_HOST_PASSWORD variable.

Thank you all for your valuable input and contributions.

@flll flll requested review from Zoey2936 and docjyJ October 13, 2024 09:04
Copy link
Collaborator

@docjyJ docjyJ left a comment

Choose a reason for hiding this comment

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

Otherwise LGTM

manual-install/update-yaml.sh Outdated Show resolved Hide resolved
Copy link
Collaborator

@docjyJ docjyJ left a comment

Choose a reason for hiding this comment

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

LGTM ❤️

@szaimen szaimen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Oct 21, 2024
Signed-off-by: lll <[email protected]>
Co-Authored-By: Jean-Yves <[email protected]>
@szaimen
Copy link
Collaborator

szaimen commented Oct 22, 2024

Hi @flll thanks a lot for this contribution! I've just invited you to the repo so that collaboration is easier :)

@szaimen
Copy link
Collaborator

szaimen commented Oct 22, 2024

The changes look good in general, but I fear there is another script that needs to be adjusted. See https://github.com/nextcloud/all-in-one/blob/main/nextcloud-aio-helm-chart/update-helm.sh

I've for easier testing pushed your changes to a local branch: #5459

After accepting my invite to the repo, you can then go to https://github.com/nextcloud/all-in-one/actions/workflows/update-helm.yml and click the Run workflow button and select the enh/5393/local-branch branch to test your changes. See
image

The changes are then going to be pushed to #5458

@flll
Copy link
Collaborator Author

flll commented Oct 24, 2024

Thank you very much.
I have edited update-helm.yml, pushed it to the enh/5393/local-branch, and ran a workflow against the local branch. I believe it was successful. #5463

I apologize for the trouble I've caused you. Once again, thank you for your assistance.

@szaimen
Copy link
Collaborator

szaimen commented Oct 24, 2024

Merged in #5459. Thanks a lot for tackling this and not giving up! 😊

@szaimen szaimen closed this Oct 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants