feat: docker compose add ssr catalogue #3711
Conversation
add nuxt ssr catalogue move enviroment vars to .env rename services
|
update docs on the .env ? |
|
unrelated to your PR: the docker images don't work on mac 👎 |
You might wan't to try this? Although the molgenis-emx2 image should be compatible with M1 (linux/arm64/v8) same for molgenis-ssr (node: linux/arm64/v8) |
| # workaround for pre catalogue routes to post catalogue routes | ||
| # enable these lines if the /catalogue routes are not used | ||
| # location ~* /(.*)/ssr-catalogue/(?!all)(.*)$ { | ||
| # return 301 $scheme://$host/$1/ssr-catalogue/all/$2; | ||
| # } | ||
|
|
There was a problem hiding this comment.
this can be removed , needed for backwards compat with already deployed service , not needed in the context of docker compose setup
docker-compose.yml
Outdated
| - MOLGENIS_POSTGRES_USER=molgenis | ||
| - MOLGENIS_POSTGRES_PASS=molgenis | ||
| # - MOLGENIS_OIDC_CLIENT_ID=[] | ||
| # - MOLGENIS_OIDC_CLIENT_SECRET=[] | ||
| # - MOLGENIS_OIDC_CLIENT_NAME=MolgenisAuth | ||
| # - MOLGENIS_OIDC_DISCOVERY_URI=https://auth.molgenis.org/.well-known/openid-configuration/ | ||
| # - MOLGENIS_OIDC_CALLBACK_URL=http://localhost:8080 |
There was a problem hiding this comment.
personally i prevere the inline env setting over the env file , less magic, the one file thing is a strong point of the dockercompose system
There was a problem hiding this comment.
I agree. Most users will find that easier too.
docker-compose.yml
Outdated
| depends_on: | ||
| postgres: | ||
| condition: service_healthy | ||
| restart: on-failure | ||
| ssr-catalogue: | ||
| molgenis-ssr-catalogue: |
There was a problem hiding this comment.
what if you want a emx2 without a catalogue ? , separate compose files ? , comment out by default ?
docs/molgenis/run_docker.md
Outdated
|
|
||
| Useful commands: | ||
| `git clone https://github.com/molgenis/molgenis-emx2.git` |
There was a problem hiding this comment.
dont need the whole repo for running via compose, could you clone / down load part of the repo ? or could we put all of the compose stuff in a single file ?
There was a problem hiding this comment.
yes that would be ideal. Then we could even add the compose to releases.
|
did you check if it works on mac now? Might be a change we should make to ssr catalogue docker build to have it cross arch? |
|
What are the main changes you did:
how to test:
todo: