Add docker-compose #33

dpordomingo · 2018-05-16T13:49:09Z

If accepted it would be only needed to run:

Run latest released image:

$ GITBASEPG_REPOS_FOLDER=./repos docker-compose up

Run from sources (useful when developing or willing to run tip of master...)

$ GITBASEPG_REPOS_FOLDER=./repos make compose-serve

smacker · 2018-05-16T13:52:36Z

docker-compose.yml

+    image: "bblfsh/bblfshd"
+    privileged: true
+    volumes:
+     - /var/lib/bblfshd:/var/lib/bblfshd


It wouldn't work on macos. Please consider using named volume instead:
bblfsh/bblfshd#136

@smacker I rebased and addressed your suggestion about named volumes; It was my first time;) did I do it properly?

carlosms · 2018-05-17T10:59:30Z

Looks great!

Maybe this is asking too much, but would it be possible to build a bblfsh container that already has all the drivers installed? I imagine something like:

compose:

bblfsh:
  build:
    context: .
    dockerfile: Dockerfile-bblfsh-drivers

Dockerfile-bblfsh-drivers

FROM bblfsh/bblfshd
RUN docker-compose exec bblfsh bblfshctl driver install --recommended

dpordomingo · 2018-05-17T16:11:23Z

@carlosms I included the driver installation process in the docker-compose.yml itself so they would be automatically installed if needed when app is ran (only for the first time).
Adding the drivers in the bblfshd image can be... weird.

Is it better for you?

carlosms

This is great!

bzz · 2018-05-18T07:59:49Z

Is it supposed to be on top of the latest master?

bzz

tried on macOS - works like a charm. 👏

bzz · 2018-05-18T08:20:26Z

docs/quickstart.md

-    --env GITBASEPG_DB_CONNECTION="gitbase@tcp(gitbase:3306)/none?maxAllowedPacket=4194304"
-    --name gitbase_playground
-   srcd/gitbase-playground:latest
+$ GITBASEPG_ENV=dev REPOS_FOLDER=./repos GITBASEPG_ENV=dev docker-compose up


as this is a quickstart that first time users might follow - do you think it might be worth not to assume that they know, but rather state explicitly here that after this command, if a user does Ctrl+C - he will still have the containers running and have to stop/kill/rm those?

with this command, Ctrl-C would kill containers.

dpordomingo · 2018-05-18T15:47:45Z

I updated the PR desc so:

# Run latest released image:
$ REPOS_FOLDER=./repos docker-compose up

# Run from sources (useful when developing or willing to run the tip of master...)
$ REPOS_FOLDER=./repos make compose-serve

@bzz This ☝️ address your #33 (comment) What it happened to you is that you started the latest tag (v0.0.1) not containing the frontend. To build the tip of master or whatever another commit, you should build and run using make compose-serve

@smacker @carlosms could you PTAL again? I included the two running options as agreed.

@eiso you might be interested in this b874407, that address your suggestions made by #36

smacker · 2018-05-18T16:01:24Z

docs/quickstart-manually.md

+
+You can locally build and deploy `gitbase-playground` and its dependencies using [`docker-compose`](https://docs.docker.com/compose/install/)
+
+If you preffer to run `gitbase-playground` with [`docker-compose`](https://docs.docker.com/compose) (without taking care of the app dependencies), you can follow [the playground compose quickstart](quickstart.md)


preffer -> prefer

smacker · 2018-05-18T16:04:29Z

LGTM!

carlosms

I left a couple of comments but I think it's looking great as it is.

carlosms · 2018-05-18T17:10:19Z

Makefile

@@ -68,6 +69,16 @@ build-path:

 serve: | front-build back-start

+compose-serve: | require-repos-folder front-dependencies build
+	REPOS_FOLDER=${REPOS_FOLDER} \


question: should this use the same GITBASEPG prefix as other env vars? It's not used by gitbase-playground itself, but it's used by the docker compose file we provide so... I'm not sure.

carlosms · 2018-05-18T17:10:54Z

docker-compose.build.yml

+
+services:
+  playground:
+    image: gitbase-playground-from-sources


Nitpick: what about shorter gitbase-playground-dev?

dpordomingo · 2018-05-21T09:25:29Z

@carlosms many thanks for your suggestions; they were addressed by d2e80c7 and 00eab08
Let me know if it looks good to you and I'll rebase and squash commits, and then proceed with the merge :D

carlosms · 2018-05-21T09:26:34Z

👏 go ahead!

Signed-off-by: David Pordomingo <David.Pordomingo.F@gmail.com>

Signed-off-by: David Pordomingo <david.pordomingo.f@gmail.com> Signed-off-by: David Pordomingo <David.Pordomingo.F@gmail.com>

Signed-off-by: David Pordomingo <David.Pordomingo.F@gmail.com>

dpordomingo added the enhancement New feature or request label May 16, 2018

dpordomingo self-assigned this May 16, 2018

dpordomingo requested review from carlosms and bzz May 16, 2018 13:49

smacker reviewed May 16, 2018

View reviewed changes

dpordomingo force-pushed the docker-compose branch from a6021dc to 2b311e0 Compare May 17, 2018 16:06

smacker approved these changes May 17, 2018

View reviewed changes

carlosms approved these changes May 17, 2018

View reviewed changes

bzz approved these changes May 18, 2018

View reviewed changes

bzz reviewed May 18, 2018

View reviewed changes

dpordomingo force-pushed the docker-compose branch from 2b311e0 to 776e2cd Compare May 18, 2018 15:46

dpordomingo mentioned this pull request May 18, 2018

Minor changes to make the code run on copy-paste #36

Closed

smacker reviewed May 18, 2018

View reviewed changes

dpordomingo mentioned this pull request May 18, 2018

Enable integration tests in Travis src-d/ci#78

Closed

carlosms approved these changes May 18, 2018

View reviewed changes

dpordomingo and others added 5 commits May 21, 2018 11:32

Add docker-compose

b3606e9

Signed-off-by: David Pordomingo <David.Pordomingo.F@gmail.com>

Address @smacker request

a282ccc

Signed-off-by: David Pordomingo <david.pordomingo.f@gmail.com> Signed-off-by: David Pordomingo <David.Pordomingo.F@gmail.com>

Fix commands to let the user copy/paste from docs

ce27083

Signed-off-by: David Pordomingo <David.Pordomingo.F@gmail.com>

Fix problem when building frontend killed and called again

7a68843

Signed-off-by: David Pordomingo <David.Pordomingo.F@gmail.com>

Let the user to choose between runing the latest or build from sources

36e318b

Signed-off-by: David Pordomingo <David.Pordomingo.F@gmail.com>

dpordomingo force-pushed the docker-compose branch from 00eab08 to 36e318b Compare May 21, 2018 09:32

dpordomingo merged commit 2bb41f9 into src-d:master May 21, 2018

dpordomingo deleted the docker-compose branch May 21, 2018 09:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add docker-compose #33

Add docker-compose #33

dpordomingo commented May 16, 2018 •

edited

Loading

smacker May 16, 2018

dpordomingo May 17, 2018

carlosms commented May 17, 2018

dpordomingo commented May 17, 2018

carlosms left a comment

bzz commented May 18, 2018

bzz left a comment

bzz May 18, 2018 •

edited

Loading

smacker May 18, 2018

dpordomingo commented May 18, 2018

smacker May 18, 2018

dpordomingo May 18, 2018

smacker commented May 18, 2018 •

edited

Loading

carlosms left a comment

carlosms May 18, 2018

carlosms May 18, 2018

dpordomingo commented May 21, 2018

carlosms commented May 21, 2018


		You can locally build and deploy `gitbase-playground` and its dependencies using [`docker-compose`](https://docs.docker.com/compose/install/)

		If you preffer to run `gitbase-playground` with [`docker-compose`](https://docs.docker.com/compose) (without taking care of the app dependencies), you can follow [the playground compose quickstart](quickstart.md)

Add docker-compose #33

Add docker-compose #33

Conversation

dpordomingo commented May 16, 2018 • edited Loading

smacker May 16, 2018

Choose a reason for hiding this comment

dpordomingo May 17, 2018

Choose a reason for hiding this comment

carlosms commented May 17, 2018

dpordomingo commented May 17, 2018

carlosms left a comment

Choose a reason for hiding this comment

bzz commented May 18, 2018

bzz left a comment

Choose a reason for hiding this comment

bzz May 18, 2018 • edited Loading

Choose a reason for hiding this comment

smacker May 18, 2018

Choose a reason for hiding this comment

dpordomingo commented May 18, 2018

smacker May 18, 2018

Choose a reason for hiding this comment

dpordomingo May 18, 2018

Choose a reason for hiding this comment

smacker commented May 18, 2018 • edited Loading

carlosms left a comment

Choose a reason for hiding this comment

carlosms May 18, 2018

Choose a reason for hiding this comment

carlosms May 18, 2018

Choose a reason for hiding this comment

dpordomingo commented May 21, 2018

carlosms commented May 21, 2018

dpordomingo commented May 16, 2018 •

edited

Loading

bzz May 18, 2018 •

edited

Loading

smacker commented May 18, 2018 •

edited

Loading