Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

[WIP] Docker Compose Added #1015

Merged
merged 1 commit into from
Mar 23, 2017
Merged

[WIP] Docker Compose Added #1015

merged 1 commit into from
Mar 23, 2017

Conversation

anishaswain
Copy link
Contributor

@anishaswain anishaswain commented Mar 22, 2017

Fixes #980

Changes proposed in this pull request:

  • reduce the steps to build and run the application .
  • Added ".dockerignore" file .
  • Added "docker-compose.yml" for necessary port mapping, linking with couchdb and running the couchdb.
  • Command to run docker-compose "docker-compose up".

Work in progress

  • Compile ember app to use production environment

cc @jkleinsc @jglovier @tangollama

@anishaswain anishaswain changed the title Docker Docker Compose Added Mar 22, 2017
@anishaswain anishaswain changed the title Docker Compose Added [WIP] Docker Compose Added Mar 22, 2017
Copy link
Member

@jkleinsc jkleinsc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@anisha1234 thanks for the PR. It looks like some of the code from your other PR #983 is in this PR.

As far as a production build for docker, the intention is that running HospitalRun in production should use https://github.com/HospitalRun/hospitalrun-server instead of hospitalrun-frontend, so if someone wants to run Docker for production, then we should do work in the https://github.com/HospitalRun/hospitalrun-server repo to accommodate that.

@@ -21,6 +21,7 @@ $blue_lightest: #eff2f5;
$blue_lightest2: #dee2e7;
$red: #ff6d6f;
$red_light: rgba($red,.3);
$red_lighter: rgba($red,.75);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes appear to be for another PR and shouldn't be in this one.

@@ -1,17 +1,17 @@
.btn {
&.on-white {
background-color: $blue_light;
color: $navy;
background-color: #00c4a2;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes also appear to be for a different PR.

@anishaswain
Copy link
Contributor Author

anishaswain commented Mar 23, 2017

@jkleinsc I looked into hospitalrun-server and it appears that it does not have a existing Dockerfile. Can you guide me in creating one ?
and I have removed those changes of PR #983 from this PR .

@jkleinsc
Copy link
Member

@anisha1234 thanks for updating this PR. I am going to merge it in. The hospitalrun-server work should be done in that repo. I just checked and eHealth Africa has been working on this: https://github.com/eHealthAfrica/hospitalrun-server/tree/conf/docker
I believe they have a decent amount of the work done, so I'd prefer they finish what they have started there.

@jkleinsc jkleinsc merged commit 7af8df1 into HospitalRun:master Mar 23, 2017
@manaswinidas manaswinidas mentioned this pull request Mar 25, 2017
23 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants