Dockerify #157
Dockerify #157
Conversation
revolunet
force-pushed
the
dockerify
branch
3 times, most recently
from
40e28aa
to
f7c113c
Compare
README.md
Outdated
|
|
||
| L'intégration HTML/CSS est réalisée et documentée dans un autre dépôt de code : [code-du-travail-css](https://github.com/SocialGouv/code-du-travail-css). | ||
| Editer `.env` et `docker-compose.override.yml` puis lancer `docker-compose up` |
There was a problem hiding this comment.
normalement ca sera yarn dev
There was a problem hiding this comment.
normalement ca sera yarn dev
c'est pas si pratique d'avoir les 3serveur qui tourne dans le meme term en fait :)
.yarnrc
Outdated
| @@ -0,0 +1 @@ | |||
| workspaces-experimental true | |||
There was a problem hiding this comment.
There was a problem hiding this comment.
it was to avoid warning message.
docker-compose.yml
Outdated
| environment: | ||
| - PYTHONPATH=. | ||
| - ES_HOST=elasticsearch | ||
| - PORT=9200 |
|
|
||
| COPY package.json /app/package.json | ||
| COPY package-lock.json /app/package-lock.json | ||
| #COPY yarn.lock /app/yarn.lock |
There was a problem hiding this comment.
will be back when yarn.lock will be versionned
There was a problem hiding this comment.
we should do it now then...
There was a problem hiding this comment.
\ping @revolunet
Same goes for /packages/code-du-travail-api/Dockerfile ?
douglasduteil
force-pushed
the
dockerify
branch
from
00d2e0c
to
7078143
Compare
|
|
||
| COPY package.json /app/package.json | ||
| COPY package-lock.json /app/package-lock.json | ||
| #COPY yarn.lock /app/yarn.lock |
There was a problem hiding this comment.
\ping @revolunet
Same goes for /packages/code-du-travail-api/Dockerfile ?
remove code-du-travail-data/.env file since its no more used add code-du-travail-api/.env file with default value for dev env
|
je propose qu'on merge et on améliore ensuite |
| @@ -63,8 +63,5 @@ typings/ | |||
| # Yarn Integrity file | |||
| .yarn-integrity | |||
|
|
|||
| # dotenv environment variables file | |||
| .env | |||
There was a problem hiding this comment.
Same should be done in /packages/code-du-travail-css/.gitignore ?
There was a problem hiding this comment.
agree, since code-du-travail-css was not using a env file, I forget to update it :)
packages/code-du-travail-data/.env
Outdated
| @@ -0,0 +1,3 @@ | |||
| PYTHONPATH=. | |||
| ES_HOST=elasticsearch | |||
| ES_PORT=9200 | |||
There was a problem hiding this comment.
I'm sorry, I thought these files was unused anymore since we handle the env globally in docker-compose.yml
There was a problem hiding this comment.
In which case we need it ?
There was a problem hiding this comment.
indeed, they are overriden by the root docker-compose.yml, we shouldnt need this except for explicitness maybe. will remove that!
This reverts commit c612762.
No description provided.