-
-
Notifications
You must be signed in to change notification settings - Fork 39
Rebased PR: add docker compose for installing a chatmail relay #664
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
base: main
Are you sure you want to change the base?
Conversation
c35f186 to
a1c2870
Compare
89ba4b5 to
ae7ec25
Compare
e6c6931 to
e61239f
Compare
e61239f to
2f4cfcc
Compare
2f4cfcc to
d12782f
Compare
- Adds configuration parameters (`change_kernel_settings`, `fs_inotify_max_user_instances_and_watchers`)
d12782f to
8541139
Compare
| ```shell | ||
| cp ./docker/docker-compose-default.yaml docker-compose.yaml | ||
| ``` | ||
|
|
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.
We missed the second step - creating .env file.
Yes, it's trivial, but not all users will immediately understand what to do (I personally know some who don't). Therefore, it is better to write this in the instructions so that it is as close as possible to the copy-paste-work format.
| 2. Copy `./docker/example.env` and rename it to `.env`. This file stores variables used in `docker-compose.yaml`. | |
| ```shell | |
| cp ./docker/example.env .env | |
| ```\ |
| ```shell | ||
| cp ./docker/docker-compose-default.yaml docker-compose.yaml | ||
| ``` | ||
|
|
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.
same
| 2. Скопировать `./docker/example.env` и переименовать в `.env`. Здесь хранятся переменные, которые используются в `docker-compose.yaml`. | |
| ```shell | |
| cp ./docker/example.env .env | |
| ```\ |
|
So, I found some more problems with the installation via Docker, some of which seem to be related to changes that were lost during the transfer. |
|
I created an issue with the main problem. |
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 also marked the lost changes. I haven't checked everything yet, but at least it won't work without this.
|
|
||
| ### MAIN | ||
|
|
||
| if [ "$DEBUG_COMMANDS_ENABLED" == "true" ]; then |
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.
| if [ "$DEBUG_COMMANDS_ENABLED" == "true" ]; then | |
| if [ "$DEBUG_COMMANDS_ENABLED" = true ]; then |
| debug_commands | ||
| fi | ||
|
|
||
| if [ "$FORCE_REINIT_INI_FILE" == "true" ]; then |
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.
| if [ "$FORCE_REINIT_INI_FILE" == "true" ]; then | |
| if [ "$FORCE_REINIT_INI_FILE" = true ]; then |
|
|
||
| # TODO: Move to debug_commands after git clone is moved to dockerfile. | ||
| git config --global --add safe.directory /opt/chatmail | ||
| if [ "$RECREATE_VENV" == "true" ]; then |
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.
| if [ "$RECREATE_VENV" == "true" ]; then | |
| if [ "$RECREATE_VENV" = true ]; then |
| fi | ||
| ./scripts/initenv.sh | ||
|
|
||
| ./scripts/cmdeploy init --config "${INI_FILE}" $INI_CMD_ARGS $MAIL_DOMAIN |
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.
| ./scripts/cmdeploy init --config "${INI_FILE}" $INI_CMD_ARGS $MAIL_DOMAIN | |
| ./scripts/cmdeploy init --config "${INI_FILE}" $INI_CMD_ARGS $MAIL_DOMAIN || true |
| ./scripts/cmdeploy init --config "${INI_FILE}" $INI_CMD_ARGS $MAIL_DOMAIN | ||
| bash /update_ini.sh | ||
|
|
||
| ./scripts/cmdeploy run --ssh-host docker |
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.
| ./scripts/cmdeploy run --ssh-host docker | |
| ./scripts/cmdeploy run --ssh-host @docker |
Thanks @Keonik1 for #614 :) I had a lot of fun with
git rebaseto break it up into small, reviewable chunks. It's still a lot, but doable :)Before we can merge this, we need to merge:
cmdeploy runoption to skip DNS checks #661Additional related PRs:
With this PR, checking DNS records should already work; Getting tests to run with a docker instance is still a bit of work (see the docker-rebase...docker-tests branch for first steps).
So for now this will be an experimental feature which we can tell people to try out if they ask for it. But in the long term we need a separate CI machine for testing the docker setup, to be sure nothing breaks when we make changes.