Skip to content

Commit 1f7bf0a

Browse files
committed
Update to bblfsh 2.9, use -drivers image
Signed-off-by: Carlos Martín <carlos.martin.sanchez@gmail.com>
1 parent 869f600 commit 1f7bf0a

4 files changed

Lines changed: 7 additions & 21 deletions

File tree

.helm-staging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
bblfshdServer:
22
image:
33
repository: bblfsh/bblfshd
4-
tag: v2.7.0
4+
tag: v2.9.0
55
pullPolicy: IfNotPresent
66
drivers:
77
install: true

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,10 @@ jobs:
4242
- make coverage
4343
- make validate-commit
4444
- script:
45-
# TODO (carlosms) fixed bblfshd version because latest fails with https://github.com/bblfsh/bblfshd/issues/195
46-
- docker run -d --name bblfshd --privileged --volume $HOME/bblfsh-drivers:/var/lib/bblfshd -p "9432:9432" bblfsh/bblfshd:v2.7.2
45+
- docker run -d --name bblfshd --privileged --volume $HOME/bblfsh-drivers:/var/lib/bblfshd -p "9432:9432" bblfsh/bblfshd
4746
- sleep 5
48-
- docker exec -it bblfshd bblfshctl driver install go docker://bblfsh/go-driver:latest
49-
- docker exec -it bblfshd bblfshctl driver install javascript docker://bblfsh/javascript-driver:latest
47+
- docker exec -it bblfshd bblfshctl driver install --force go docker://bblfsh/go-driver:latest
48+
- docker exec -it bblfshd bblfshctl driver install --force javascript docker://bblfsh/javascript-driver:latest
5049
- mkdir $HOME/repos
5150
- git clone https://github.com/src-d/gitbase-web.git $HOME/repos/gitbase-web
5251
- docker run -d --name gitbase -p "3367:3306" -e "BBLFSH_ENDPOINT=bblfshd:9432" --volume $HOME/repos:/opt/repos --link bblfshd srcd/gitbase

docker-compose.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,5 @@ services:
1919
volumes:
2020
- ${GITBASEPG_REPOS_FOLDER}:/opt/repos
2121
bblfsh:
22-
image: "bblfsh/bblfshd:v2.7.2"
22+
image: "bblfsh/bblfshd:v2.9.0-drivers"
2323
privileged: true
24-
volumes:
25-
- type: volume
26-
source: drivers
27-
target: /var/lib/bblfshd
28-
entrypoint: ["/bin/sh"]
29-
command:
30-
- "-c"
31-
- "bblfshd & sleep 5 && bblfshctl driver install --recommended && tail -f /dev/null"
32-
33-
volumes:
34-
drivers:

docs/CONTRIBUTING.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,14 @@ Make sure you also satisfy these requirements:
1818

1919
As with a normal deployment, if you don't use Docker Compose you will need to configure a [gitbase](https://docs.sourced.tech/gitbase) server, and a [bblfsh](https://doc.bblf.sh/) server. It is recommended to read their documentation, but here is a quick guide on how to run both as docker containers.
2020

21-
Launch bblfshd and install the required drivers:
21+
Launch bblfshd. The `-drivers` image already contains all the recommended drivers:
2222

2323
```bash
2424
$ docker run \
2525
--privileged \
2626
--publish 9432:9432 \
27-
--volume /var/lib/bblfshd:/var/lib/bblfshd \
2827
--name bblfsh \
29-
bblfsh/bblfshd
30-
$ docker exec -it bblfsh bblfshctl driver install --recommended
28+
bblfsh/bblfshd:latest-drivers
3129
```
3230

3331
gitbase will serve Git repositories, so you will need to to populate a directory with them:

0 commit comments

Comments
 (0)