Skip to content

Conversation

@missytake
Copy link
Contributor

@missytake missytake commented Oct 8, 2025

Thanks @Keonik1 for #614 :) I had a lot of fun with git rebase to break it up into small, reviewable chunks. It's still a lot, but doable :)

Before we can merge this, we need to merge:

Additional 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.

@missytake missytake force-pushed the sshexec-docker branch 2 times, most recently from c35f186 to a1c2870 Compare October 14, 2025 18:44
Base automatically changed from sshexec-docker to sshexec-rework October 14, 2025 19:29
Base automatically changed from sshexec-rework to main October 14, 2025 20:27
@missytake missytake requested review from hpk42 and link2xt October 15, 2025 12:23
```shell
cp ./docker/docker-compose-default.yaml docker-compose.yaml
```

Copy link
Collaborator

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.

Suggested change
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
```

Copy link
Collaborator

Choose a reason for hiding this comment

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

same

Suggested change
2. Скопировать `./docker/example.env` и переименовать в `.env`. Здесь хранятся переменные, которые используются в `docker-compose.yaml`.
```shell
cp ./docker/example.env .env
```\

@Keonik1
Copy link
Collaborator

Keonik1 commented Oct 26, 2025

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.
Some of them came from changes that were pulled from the master.

@Keonik1
Copy link
Collaborator

Keonik1 commented Oct 26, 2025

I created an issue with the main problem.

#694

Copy link
Collaborator

@Keonik1 Keonik1 left a 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
Copy link
Collaborator

@Keonik1 Keonik1 Oct 26, 2025

Choose a reason for hiding this comment

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

Suggested change
if [ "$DEBUG_COMMANDS_ENABLED" == "true" ]; then
if [ "$DEBUG_COMMANDS_ENABLED" = true ]; then

debug_commands
fi

if [ "$FORCE_REINIT_INI_FILE" == "true" ]; then
Copy link
Collaborator

@Keonik1 Keonik1 Oct 26, 2025

Choose a reason for hiding this comment

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

Suggested change
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
Copy link
Collaborator

@Keonik1 Keonik1 Oct 26, 2025

Choose a reason for hiding this comment

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

Suggested change
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
Copy link
Collaborator

@Keonik1 Keonik1 Oct 26, 2025

Choose a reason for hiding this comment

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

Suggested change
./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
Copy link
Collaborator

@Keonik1 Keonik1 Oct 26, 2025

Choose a reason for hiding this comment

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

Suggested change
./scripts/cmdeploy run --ssh-host docker
./scripts/cmdeploy run --ssh-host @docker

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.

3 participants