New docker setup #1085

melroy89 · 2024-09-04T09:35:13Z

Follow-up from: #1021

Testing
Introduce an internal network (do not expose ports like PostgreSQL to the host) for services that can stay internal
...

It's the latest at the time of this commit

It should be using the entrypoint from the image

symfony/symfony#34660 Symfony devs always force the use of a `.env` file even if the env is set properly. The cleanest is thus to have an empty `.env` and pass the real env to the container.

curl isn't installed in the image and the health check was constantly failing

/public files are copied into a common volume shared between reverse proxy and PHP-FPM service.

Otherwise the logs get filled with 'FATAL: role "root" does not exist' everytime the health is checked

After supporting arbitrary reverse proxies, media uploads were broken. They are uploaded to public/media/ by `php` service, but the previous solution just provided a copy of public/media/ at first run. New uploads weren't shared with the `www` service. Now, instead of just providing a copy, a mount is provided. To do so the strategy was changed and a lead taken out of nextcloud's book: https://github.com/nextcloud/docker/blob/65138b6d22bec1ac15e2f0f125426290640bb97a/docker-entrypoint.sh **The problem** The image had the mbin sources in /var/www/mbin. Mounting docker/storage/public into /var/www/mbin/public would replace the image's public/ with a (hitherto) empty directory. **The solution** The image has its sources in /usr/src/mbin and on startup, syncs that into the new mount /var/www/mbin using `rsync`. In this manner, previous uploads are preserved and source changes update /var/www/mbin.

Separate images are now available because mbin isn't solely bound to caddy and can be used with any reverse proxy.

These come due to the refactoring: - `docker/compose.yml` --> `/compose.yml` - support for arbitrary reverse proxies without running caddy - smaller docker image - allow overrides without changing versioned files

Co-authored-by: Melroy van den Berg <[email protected]>

@melroy

It wouldn't start without the file and I realised it had been there the entire time when testing the documentation. @melroy tested it without and discovered the bug

This follows what is done for the production guide, which has 2 guides/files as well.

melroy89 · 2024-09-04T09:36:36Z

.env.example_docker

@@ -107,6 +111,10 @@ EXIF_EXIFTOOL_PATH=
 # max execution time for exiftool in seconds, defaults to 10 seconds
 EXIF_EXIFTOOL_TIMEOUT=10

+###> caddy ###
+PHP_FASTCGI_HOST=php:9000


This shouldn't be here.

melroy89 · 2024-09-04T09:37:24Z

.env.example_docker

@@ -31,6 +31,10 @@ KBIN_META_KEYWORDS="mbin, content aggregator, open source, fediverse"
 KBIN_HEADER_LOGO=false
 KBIN_FEDERATION_PAGE_ENABLED=true
 MBIN_DEFAULT_THEME=default
+MBIN_HOME=/var/www/mbin


These en vars shouldn't be here as well ideally put these in the compose override yaml file.

github-actions · 2024-10-19T02:39:08Z

This PR is stale because it has been open 40 days with no activity.

LoveIsGrief added 30 commits September 4, 2024 11:32

chore(docker): add .env to redis and db services

51317a2

chore: make docker runnable as dev app

f92c58a

rework docker for dev

e75466d

wip: split compose.yml

c83485b

Add TODO for prod entrypoint

d0053cd

Use .env.dev_docker in compose.dev.yml

3094794

Simplify dev docker compose

e39052b

tick off docker internal host linux

6f41aec

chore(docker): add app.ini to compose.dev.yml

4596cb2

chore(docker): remove unnecessary comment

9ba6bef

chore: add replicas to messenger service in compose.prod.yml

f352c2f

chore: upgrade postgres to v16

bf23ce6

It's the latest at the time of this commit

wip: semi-function production images

1d279e0

refactor: remove set -x in docker entrypoint

f9d4a17

refactor(compose): don't mount entrypoint into prod

8e9f9c8

It should be using the entrypoint from the image

refactor(docker): use dummy .env for prod Dockerfile

43377ff

symfony/symfony#34660 Symfony devs always force the use of a `.env` file even if the env is set properly. The cleanest is thus to have an empty `.env` and pass the real env to the container.

fix(docker): use wget to check www health

b003496

curl isn't installed in the image and the health check was constantly failing

Support running mbin behind any reverse proxy

2fccae4

/public files are copied into a common volume shared between reverse proxy and PHP-FPM service.

Fix docker dev after making it work for prod

5b12728

Add documentation docker env

968381f

Comments + remove unnecessary mounts from prod compose

96dc91d

fix: call pg_isready with user variable

b59f67c

Otherwise the logs get filled with 'FATAL: role "root" does not exist' everytime the health is checked

rm notes.md

2cd5b58

chore: remove unused file

e4d27ce

chore(doc): document overriding in dev docker env

427a86c

chore(gh-actions): Publish PHP and caddy images

ff25214

Separate images are now available because mbin isn't solely bound to caddy and can be used with any reverse proxy.

chore(docker): Update docs for production

1999588

These come due to the refactoring: - `docker/compose.yml` --> `/compose.yml` - support for arbitrary reverse proxies without running caddy - smaller docker image - allow overrides without changing versioned files

fix(docker): do not expose rabbitmq port to the world in production

37b9705

chore(doc): Add link to development environment in CONTRIBUTING.md

1e03b83

LoveIsGrief and others added 13 commits September 4, 2024 11:32

refactor(docker): remove unnecessary networks from compose.prod.yml

fa8616f

chore(docker): Update nodejs image to 22.7.0

26127f0

chore(docker): docker-compose does actually work :O

9da2e85

Fix typos in docs/04-contributing/development_environment.md

58014b1

Co-authored-by: Melroy van den Berg <[email protected]>

Fix more typos in docs/04-contributing/development_environment.md

25578c7

Co-authored-by: Melroy van den Berg <[email protected]>

chore(docker): Reference PHP8.3 in development_environment.md

ca668e0

refactor(docker): remove unnecessary pwd from entrypoint.sh

585ae55

chore(docker): Remove warning about nginx config

3e5e1ef

fix(docker): Depend on /.env and add instructions

7466547

It wouldn't start without the file and I realised it had been there the entire time when testing the documentation. @melroy tested it without and discovered the bug

chore(docs): Split development_environment.md in two

bea9c07

This follows what is done for the production guide, which has 2 guides/files as well.

chore(docs): Replace bold single lines with headers

2d79a3b

chore(docs): update docs/04-contributing/docker.md title

6c10103

refactor(docker): Use 8008 for www service in prod too

97ec77d

melroy89 added enhancement New feature or request docker Issues and pull requests related to docker environment labels Sep 4, 2024

melroy89 commented Sep 4, 2024

View reviewed changes

melroy89 added this to the v1.8.0 milestone Sep 4, 2024

This was referenced Sep 5, 2024

Add trusted proxies to docs #1086

Merged

docker: Investigate using separate networks for services #1073

Closed

BentiGorlich assigned melroy89 Sep 8, 2024

melroy89 mentioned this pull request Sep 21, 2024

Trusted Proxies breaks HTTPS schema in Docker #1142

Open

github-actions bot added the Stale Inactivity for too long label Oct 19, 2024

melroy89 added 2 commits November 8, 2024 14:13

Merge branch 'main' into new_docker_setup

12944ce

Merge branch 'main' into new_docker_setup

ecbce87

github-actions bot removed the Stale Inactivity for too long label Nov 9, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New docker setup #1085

New docker setup #1085

melroy89 commented Sep 4, 2024 •

edited

Loading

melroy89 Sep 4, 2024

melroy89 Sep 4, 2024

github-actions bot commented Oct 19, 2024

New docker setup #1085

Are you sure you want to change the base?

New docker setup #1085

Conversation

melroy89 commented Sep 4, 2024 • edited Loading

melroy89 Sep 4, 2024

Choose a reason for hiding this comment

melroy89 Sep 4, 2024

Choose a reason for hiding this comment

github-actions bot commented Oct 19, 2024

melroy89 commented Sep 4, 2024 •

edited

Loading