build(docker): Allows sharing of network #16937

ojongerius · 2018-03-23T02:15:27Z

See #16936 for details

docker-compose.yml

@@ -23,6 +24,7 @@ services:
        working_dir: /fcc
        command:
            - npm
-            - start
+            - run
+            - develop


docker-compose.yml

-
-    server:
+        ports:
+            - "27017:27017" # Change port if needed


docker-compose-shared.yml

+        networks:
+            - shared
+
+networks: # Used by by other projects like open-api


docker-compose-shared.yml

+    db:
+        networks:
+            - shared
+    freecodecamp:


docker-compose-shared.yml

+#   docker-compose -f docker-compose.yml -f docker-compose-shared.yml up
+#
+version: "2"
+services:


docker-compose-shared.yml

+# Run with:
+#   docker-compose -f docker-compose.yml -f docker-compose-shared.yml up
+#
+version: "2"


ojongerius · 2018-03-23T23:54:52Z

Note that merging #16825 borked this PR. I'll update based on what went in after the weekend.

camperbot · 2018-03-25T21:06:43Z

@ojongerius updated the pull request.

camperbot · 2018-03-25T21:12:02Z

@ojongerius updated the pull request.

camperbot · 2018-03-25T21:34:07Z

@ojongerius updated the pull request.

ojongerius · 2018-03-25T21:37:25Z

Merged changes from #16825, good to review when you have time. /cc @Bouncey

docker-compose.yml

+#
+version: "3"
+services:
+    db:


docker-compose.yml

+    db:
+        image: mongo:3.2.6
+        ports:
+            - "27017:27017" # Change port if needed


docker-compose.yml

+version: "3"
+services:
+    db:
+        image: mongo:3.2.6


docker-compose.yml

+        image: mongo:3.2.6
+        ports:
+            - "27017:27017" # Change port if needed
+    freecodecamp:


docker-compose.yml

+        ports:
+            - "27017:27017" # Change port if needed
+    freecodecamp:
+        image: node:8.9.4


docker-compose.yml

+        image: node:8.9.4
+        depends_on:
+            - db
+            - mailhog


docker-compose.yml

+        environment:
+            - MONGOHQ_URL=mongodb://db:27017/freecodecamp
+        volumes:
+            - .:/app


docker-compose.yml

+            - develop
+        ports:
+            - "3000:3000" # Change port if needed
+    mailhog:


sample.docker-compose.yml

@@ -1,31 +0,0 @@
-# Docker Compose sample file for freeCodeCamp


.gitignore

@@ -56,5 +56,3 @@ public/css/main*
 webpack-bundle-stats.html
 server/rev-manifest.json
 google-credentials.json
-
-docker-compose.yml


CONTRIBUTING.md

 docker-compose up
 ```

+#### Shared


CONTRIBUTING.md


-You need to have [docker](https://docs.docker.com/install/) and [docker-compose](https://docs.docker.com/compose/install/) installed before executing commands below.
+You'll need to have [docker](https://docs.docker.com/install/) and [docker-compose](https://docs.docker.com/compose/install/) installed before executing commands below.


CONTRIBUTING.md

 docker-compose up
 ```

+#### Shared


docker-compose.yml

+        image: node:8.9.4
+        depends_on:
+            - db
+            - mailhog


camperbot · 2018-03-26T21:10:31Z

@ojongerius updated the pull request.

camperbot · 2018-03-26T21:14:24Z

@ojongerius updated the pull request.

ojongerius · 2018-03-26T21:16:04Z

@Bouncey ready for re-review 😄

ojongerius · 2018-03-27T02:01:29Z

AFAICT to the site to be able to reach mailhog twe'll need to add a datasources file for docker, or make changes to datasources.development and use mailhog instead of localhost when running in Docker.

Before I make those changes (far outside of the scope of this original PR), do you have any preference? I'm erring on staying with datasources.development, adding some complexity to it, but I still believe in a bright future where all the things are neatly containerised.

Edit: have implemented this in 4b4b55ba6dd5b12a899d2e5910240dcdad6c86a9

camperbot · 2018-03-27T04:09:39Z

@ojongerius updated the pull request.

camperbot · 2018-03-27T04:22:21Z

@ojongerius updated the pull request.

ojongerius · 2018-03-29T04:02:38Z

@raisedadead why is the blocked for Beta? Because PR work is a constrained resource?

raisedadead · 2018-03-29T15:39:57Z

Hi @ojongerius can you take a minute to squash this? I am having trouble pulling the PR. Sorry I just happened to switch machines and dont have my usual dotfiles to rescue me.

Edit: found the problem.

camperbot · 2018-03-29T16:16:46Z

@raisedadead updated the pull request.

raisedadead · 2018-03-29T16:17:15Z

Fixed.

raisedadead

Almost there.

server/datasources.development.js

@@ -23,7 +23,14 @@ if (!process.env.SES_ID) {
    }
  };
  debug(`using MailHog server on port ${ds.mail.transport.port}`);
-} else {


raisedadead · 2018-03-29T16:25:55Z

Hi @ojongerius I have rebased / sqashed this PR (don't worry the descriptions are in there).
You should just delete you local branch for this PR and then fetch and checkout.

One minor change and we are good to go!

camperbot · 2018-03-30T01:12:23Z

@ojongerius updated the pull request.

build(docker): Expose mailhog port. build(Docker): Improve wording. build(docker): Mailhog and network changes. * Add mailhog container to shared network to enable connectivity * Configure project name for docker compose in .env sample file, without it the basename of the repo directory is used, which makes it unreachable for other services * Set mailhog host to mailhog (instead of localhost) if MAILHOG_HOST env var is set * Expose 1025 to enable local troubleshooting build(docker): Update README to reflect compose changes.

ojongerius · 2018-03-30T01:16:15Z

@raisedadead thanks for squashing and the suggestion to simplify!

…mage * upstream/staging: (36 commits) docs(documentation): Update readme.md and contributor.md (freeCodeCamp#16990) feat: Allows sharing of network (freeCodeCamp#16937) fix(seed): Correct typos in es6.json (freeCodeCamp#16972) fix(seed): Add test for checking the length of buttons is 2 (freeCodeCamp#16921) fix(challenges): Change Symmetric Differences Title (freeCodeCamp#16962) fix(challenges): Fix typo in css-grid justify-self challenge (freeCodeCamp#16961) chore(package): Update react-freecodecamp-search (freeCodeCamp#16943) fix(seed): Fixed issue with approximately always failing (freeCodeCamp#16752) fix(lang): Refetch mapUi on language change (freeCodeCamp#16844) fix(seed): Make element naming optional (freeCodeCamp#16926) fix(seed): Chall seed and test are modified to allow better t (freeCodeCamp#16928) fix(projects): Add user stories to projects' description (freeCodeCamp#16924) feat(seed): An HTML illustration added (freeCodeCamp#16939) fix(gulp): run babel-node with inspect flag in debug (freeCodeCamp#16901) fix: remove flash saying JS is disabled fix(common): Added expected homeURL that was missing (freeCodeCamp#16922) fix(settings): Night mode settings and profile page UI improvements (freeCodeCamp#16806) style(settings): Remove extra whitespace fix(settings): Report user modal centered to the page fix(settings): Fix modal success button hover animation ...

QuincyLarson added the status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. label Mar 23, 2018

ojongerius commented Mar 23, 2018

View reviewed changes

docker-compose.yml Outdated

@@ -23,6 +24,7 @@ services:

working_dir: /fcc

command:

- npm

- start

- run

- develop

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

ojongerius commented Mar 23, 2018

View reviewed changes

docker-compose.yml Outdated

server:

ports:

- "27017:27017" # Change port if needed

This comment was marked as off-topic.

Sign in to view

ojongerius commented Mar 23, 2018

View reviewed changes

docker-compose-shared.yml

networks:

- shared

networks: # Used by by other projects like open-api

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

ojongerius commented Mar 23, 2018

View reviewed changes

docker-compose-shared.yml Outdated

db:

networks:

- shared

freecodecamp:

This comment was marked as off-topic.

Sign in to view

ojongerius commented Mar 23, 2018

View reviewed changes

docker-compose-shared.yml Outdated

# docker-compose -f docker-compose.yml -f docker-compose-shared.yml up

#

version: "2"

services:

This comment was marked as off-topic.

Sign in to view

raisedadead changed the title ~~feat: Allows sharing of network, addresses #16936~~ build(docker): Allows sharing of network Mar 23, 2018

raisedadead added the status: blocked for beta label Mar 23, 2018

Bouncey reviewed Mar 23, 2018

View reviewed changes

ojongerius mentioned this pull request Mar 23, 2018

Docker Setup freeCodeCamp/open-api#20

Closed

ojongerius force-pushed the feature/share_network branch 2 times, most recently from 0ac9ccb to 242a77c Compare March 25, 2018 21:34