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

New docker setup #1085

Draft
wants to merge 46 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
51317a2
chore(docker): add .env to redis and db services
Aug 11, 2024
f92c58a
chore: make docker runnable as dev app
Aug 11, 2024
e75466d
rework docker for dev
Aug 12, 2024
c83485b
wip: split compose.yml
Aug 12, 2024
d0053cd
Add TODO for prod entrypoint
Aug 12, 2024
3094794
Use .env.dev_docker in compose.dev.yml
Aug 12, 2024
e39052b
Simplify dev docker compose
Aug 12, 2024
6f41aec
tick off docker internal host linux
Aug 12, 2024
4596cb2
chore(docker): add app.ini to compose.dev.yml
Aug 13, 2024
9ba6bef
chore(docker): remove unnecessary comment
Aug 13, 2024
f352c2f
chore: add replicas to messenger service in compose.prod.yml
Aug 13, 2024
bf23ce6
chore: upgrade postgres to v16
Aug 13, 2024
1d279e0
wip: semi-function production images
Aug 13, 2024
f9d4a17
refactor: remove `set -x` in docker entrypoint
Aug 14, 2024
8e9f9c8
refactor(compose): don't mount entrypoint into prod
Aug 14, 2024
43377ff
refactor(docker): use dummy .env for prod Dockerfile
Aug 14, 2024
b003496
fix(docker): use wget to check www health
Aug 15, 2024
2fccae4
Support running mbin behind any reverse proxy
Aug 16, 2024
5b12728
Fix docker dev after making it work for prod
Aug 16, 2024
968381f
Add documentation docker env
Aug 16, 2024
96dc91d
Comments + remove unnecessary mounts from prod compose
Aug 16, 2024
b59f67c
fix: call pg_isready with user variable
Aug 16, 2024
2cd5b58
rm notes.md
Aug 16, 2024
86d6ae7
fix(docker): support uploading media
Aug 18, 2024
e4d27ce
chore: remove unused file
Aug 18, 2024
427a86c
chore(doc): document overriding in dev docker env
Aug 18, 2024
ff25214
chore(gh-actions): Publish PHP and caddy images
Aug 18, 2024
1999588
chore(docker): Update docs for production
Aug 19, 2024
37b9705
fix(docker): do not expose rabbitmq port to the world in production
Aug 19, 2024
1e03b83
chore(doc): Add link to development environment in CONTRIBUTING.md
Aug 19, 2024
fa8616f
refactor(docker): remove unnecessary networks from compose.prod.yml
Aug 27, 2024
26127f0
chore(docker): Update nodejs image to 22.7.0
Aug 27, 2024
9da2e85
chore(docker): docker-compose does actually work :O
Sep 1, 2024
58014b1
Fix typos in docs/04-contributing/development_environment.md
Sep 1, 2024
25578c7
Fix more typos in docs/04-contributing/development_environment.md
Sep 1, 2024
ca668e0
chore(docker): Reference PHP8.3 in development_environment.md
Sep 1, 2024
585ae55
refactor(docker): remove unnecessary `pwd` from entrypoint.sh
Sep 1, 2024
3e5e1ef
chore(docker): Remove warning about nginx config
Sep 1, 2024
7466547
fix(docker): Depend on /.env and add instructions
Sep 1, 2024
bea9c07
chore(docs): Split development_environment.md in two
Sep 2, 2024
2d79a3b
chore(docs): Replace bold single lines with headers
Sep 2, 2024
6c10103
chore(docs): update docs/04-contributing/docker.md title
Sep 2, 2024
97ec77d
refactor(docker): Use 8008 for www service in prod too
Sep 2, 2024
12944ce
Merge branch 'main' into new_docker_setup
melroy89 Nov 8, 2024
ecbce87
Merge branch 'main' into new_docker_setup
melroy89 Nov 8, 2024
80983ea
Merge branch 'main' into new_docker_setup
melroy89 Nov 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add TODO for prod entrypoint
LoveIsGrief authored and melroy89 committed Sep 4, 2024

Verified

This commit was signed with the committer’s verified signature.
melroy89 Melroy van den Berg
commit d0053cdc8aa6144eea4ae6756fb8b64560aae6d4
2 changes: 1 addition & 1 deletion docker/php/Dockerfile
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ RUN install-php-extensions \
xml



# TODO Use a different entrypoint for prod?
COPY ./docker/php/entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
3 changes: 2 additions & 1 deletion notes.md
Original file line number Diff line number Diff line change
@@ -14,7 +14,8 @@
```
- [ ] Make a separate `.env.dev` for development
- [ ] use `.env.dev` in `compose.dev.yml`

- [ ] Update `compose.prod.yml`
- [ ] Use separate `entrypoint.sh` for prod image?
- [ ] mention that resetting means `sudo rm -rf docker/storage`
- [ ] move `.gitignore` out of storage otherwise resetting still creates a commit by deleting `.gitignore`
- [ ] `docker/storage` needs to be writable to `mbin` user!