Merged
Conversation
I broke the default Dockerfile command in `7cfcb5`. While the Dockerfile did always specify the WSGI app `aleph.manage:app`, this has been incorrect for some time and it should have always been `aleph.wsgi:app`. Previously we never actually ran a container with the default command though and instead specified the command in the `docker-compose.yml` file. I removed the "duplicate" command in the `docker-compose.yml` in the referenced commit and thus the default command in the Dockerfile is now used. I’ve now changed the default command specified in `Dockerfile` to be in line with the command previously set in `docker-compose.yml` (https://github.com/alephdata/aleph/blob/3.15.5/docker-compose.yml#L76). * The WSGI app is now `aleph.wsgi:app` (this is specified in `gunicorn.py` not via a CLI option). * Uses 6 workers by default (instead of 5). Closes #3606
We recently renamed the `master` branch to `main` and changed the default branch in GitHub to `develop`. Because a branch with the name `master` doesn’t exist anymore, GitHub redirects all links to the default branch which is not `develop`. In some cases this leads to problems, e.g. the installation guide effectively links to the Docker Compose configuration and environment templates on the `develop` branch instead of the stable `main` branch.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I broke the default Dockerfile command in
7cfcb5. While the Dockerfile did always specify the WSGI appaleph.manage:app, this has been incorrect for some time and it should have always beenaleph.wsgi:app. Previously we never actually ran a container with the default command though and instead specified the command in thedocker-compose.ymlfile. I removed the "duplicate" command in thedocker-compose.ymlin the referenced commit and thus the default command in the Dockerfile is now used.I’ve now changed the default command specified in
Dockerfileto be in line with the command previously set indocker-compose.yml(https://github.com/alephdata/aleph/blob/3.15.5/docker-compose.yml#L76).aleph.wsgi:app(this is specified ingunicorn.pynot via a CLI option).debug(instead ofinfo).Additionally, the installation guide in the docs referenced the configuration templates on the
developbranch instead ofmain. We recently renamedmaintomasterand changed the default branch todevelop. GitHub now redirects any links that still use the oldmasterbranch to the default branch. I’ve fixed this too.Closes #3606