Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: victor73/OSDF
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: IGS/OSDF
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 7 commits
  • 6 files changed
  • 2 contributors

Commits on Mar 18, 2019

  1. Add docker-compose for couchdb and elasticsearch dependencies

    Gene Hsu committed Mar 18, 2019
    Copy the full SHA
    263b9a3 View commit details

Commits on Mar 20, 2019

  1. Merge pull request #1 from genehsu/docker_dependencies 

    Add docker-compose for couchdb and elasticsearch dependencies
    @victor73
    victor73 authored Mar 20, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0b07d1e View commit details

Commits on Apr 9, 2019

  1. Add elasticsearch-river-couchdb plugin to docker-compose formula

    Gene Hsu committed Apr 9, 2019
    Copy the full SHA
    13cd99e View commit details

Commits on Apr 24, 2019

  1. Merge pull request #2 from genehsu/docker_dependencies 

    Add elasticsearch-river-couchdb plugin to docker-compose formula
    @victor73
    victor73 authored Apr 24, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    02ae8b9 View commit details

Commits on May 13, 2019

  1. Merge branch 'master' of https://github.com/IGS/OSDF

    @victor73
    victor73 committed May 13, 2019
    Copy the full SHA
    f593172 View commit details

Commits on May 29, 2019

  1. Merge remote-tracking branch 'upstream/master'

    @victor73
    victor73 committed May 29, 2019
    Copy the full SHA
    5bb33b7 View commit details

Commits on Nov 1, 2019

  1. Merge remote-tracking branch 'upstream/master'

    @victor73
    victor73 committed Nov 1, 2019
    Copy the full SHA
    f17959d View commit details
2 changes: 2 additions & 0 deletions docker/osdf/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/couchdb/**
/elasticsearch/**
3 changes: 3 additions & 0 deletions docker/osdf/Dockerfile-elasticsearch-river-couchdb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM elasticsearch:1.7.4

RUN /usr/share/elasticsearch/bin/plugin install elasticsearch/elasticsearch-river-couchdb/2.6.0
7 changes: 7 additions & 0 deletions docker/osdf/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Creating docker image with elasticsearch and elasticsearch-river-couchdb plugin

Run this command

docker build -f Dockerfile-elasticsearch-river-couchdb -t elasticsearch-river-couchdb .

Then you should be able to run docker-compose
Empty file added docker/osdf/couchdb/.keep
View file
Empty file.
18 changes: 18 additions & 0 deletions docker/osdf/docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version: "3"
services:
elasticsearch:
image: elasticsearch-river-couchdb
ports:
- "9200:9200"
volumes:
- ./elasticsearch:/usr/share/elasticsearch/data/elasticsearch

couchdb:
image: couchdb
ports:
- "5984:5984"
environment:
COUCHDB_USER: admin
COUCHDB_PASSWORD: admin
volumes:
- ./couchdb:/opt/couchdb/data
Empty file added docker/osdf/elasticsearch/.keep
View file
Empty file.