Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#1716] Pass database to https://host/di/ #1724

Merged
merged 9 commits into from
Aug 7, 2018
Merged

[#1716] Pass database to https://host/di/ #1724

merged 9 commits into from
Aug 7, 2018

Conversation

i5o
Copy link
Contributor

@i5o i5o commented Jul 24, 2018

No description provided.

@i5o
Copy link
Contributor Author

i5o commented Jul 24, 2018

services:
  couchdb:
    expose:
      - 5984
    image: treehouses/couchdb:2.1.1
    ports:
      - "2200:5984"
  db-init:
    image: treehouses/planet-tags:db-init-0.2.13-dbpass-e35d5f10
    depends_on:
      - couchdb
    environment:
      - COUCHDB_HOST=https://couchdb:5984
  planet:
    image: treehouses/planet-tags:0.2.13-dbpass-e35d5f10
    ports:
      - "80:80"
    volumes:
      - "/var/run/docker.sock:/var/run/docker.sock"
    environment:
      - MULTIPLE_IPS=true
      - HOST_PROTOCOL=http
      - DB_HOST=127.0.0.1
      - DB_PORT=2200
      - CENTER_ADDRESS=earth.ole.org:2200
    depends_on:
      - couchdb
version: "2"

Copy link
Member

@lmmrssa lmmrssa left a comment

Choose a reason for hiding this comment

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

tested on rpi with tunnel and it seems to work. Not sure if there is anything left to work on.

@i5o
Copy link
Contributor Author

i5o commented Jul 26, 2018

Thanks for testing @lmmrssa, we still need to make "_utils" works.
It basically involves playing with nginx rules, which I guess we are doing on friday

@lmmrssa
Copy link
Member

lmmrssa commented Jul 26, 2018

@i5o @paulbert @dogi we are able to access fauxton with different port tunnel to rpi
Please check pirate.sh:22682 for fauxton and pirate.sh:22680 for planet.
So I think we can merge this PR.

@i5o
Copy link
Contributor Author

i5o commented Jul 26, 2018

Yes. We are. But the whole idea of /di is to have the full couchdb experience on the same server as planet.
We can merge, for sure, but that will be missing and should/could be added in next interations

@i5o i5o changed the title [#1716] Pass database to https://host/di/ (work in progress) [#1716] Pass database to https://host/di/ Jul 27, 2018
@i5o
Copy link
Contributor Author

i5o commented Aug 3, 2018

Are we going to merge it @lmmrssa ?

Perhaps changing /di to /db before?

@@ -57,7 +57,7 @@ server {
add_header Content-Type text/plain;
}

location /di/ {
location /db/ {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

😢 😞

Copy link
Member

@paulbert paulbert left a comment

Choose a reason for hiding this comment

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

I think it's mostly working. We can fix _utils in a later PR.

@paulbert
Copy link
Member

paulbert commented Aug 7, 2018

Almost merged this before realizing that the changes to environment.ts would break our development environment. Only needed to change the value for production where we have docker/nginx.

@paulbert paulbert merged commit a0958c3 into master Aug 7, 2018
@lmmrssa lmmrssa deleted the dbpass branch August 14, 2018 05:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants