Skip to content

Commit

Permalink
DEMO102019: switch to volumes
Browse files Browse the repository at this point in the history
  • Loading branch information
ixio committed Oct 1, 2019
1 parent adff4c2 commit 453545a
Show file tree
Hide file tree
Showing 217 changed files with 15 additions and 86 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
volumes/*
6 changes: 1 addition & 5 deletions FeatureService/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,8 @@ RUN patch -p0 < hyperswitch.patch
RUN touch htpasswd && \
cp config.test.yaml config.yaml && \
sed -i "s/1h/40d/g" config.yaml && \
sed -i "s/port: 5433/port: 5432,\n host: 'testdb'/" knexfile.js
sed -i "s/port: 5433/port: 5433,\n host: 'db'/" knexfile.js

RUN ln -s /opt/FeatureService/node_modules/knex/bin/cli.js /usr/bin/knex

COPY data/*.wav resources/annotator/wav/
COPY data/*.png resources/annotator/png/
COPY data/init.js db/seeds/test/

EXPOSE 7231
Binary file removed FeatureService/data/MAD15_268_1.png
Binary file not shown.
Binary file removed FeatureService/data/MAD15_268_1.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD15_268_2.png
Binary file not shown.
Binary file removed FeatureService/data/MAD15_268_2.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD15_268_3.png
Binary file not shown.
Binary file removed FeatureService/data/MAD15_268_3.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD15_268_4.png
Binary file not shown.
Binary file removed FeatureService/data/MAD15_268_4.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD15_268_5.png
Binary file not shown.
Binary file removed FeatureService/data/MAD15_268_5.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD15_268_6.png
Binary file not shown.
Binary file removed FeatureService/data/MAD15_268_6.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD15_268_7.png
Binary file not shown.
Binary file removed FeatureService/data/MAD15_268_7.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD15_287_1.png
Binary file not shown.
Binary file removed FeatureService/data/MAD15_287_1.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD15_287_2.png
Binary file not shown.
Binary file removed FeatureService/data/MAD15_287_2.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD15_287_3.png
Binary file not shown.
Binary file removed FeatureService/data/MAD15_287_3.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD15_287_4.png
Binary file not shown.
Binary file removed FeatureService/data/MAD15_287_4.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD15_287_5.png
Binary file not shown.
Binary file removed FeatureService/data/MAD15_287_5.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD15_287_6.png
Binary file not shown.
Binary file removed FeatureService/data/MAD15_287_6.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD15_287_7.png
Binary file not shown.
Binary file removed FeatureService/data/MAD15_287_7.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD2012_259_1.png
Binary file not shown.
Binary file removed FeatureService/data/MAD2012_259_1.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD2012_259_2.png
Binary file not shown.
Binary file removed FeatureService/data/MAD2012_259_2.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD2012_259_3.png
Binary file not shown.
Binary file removed FeatureService/data/MAD2012_259_3.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD2012_259_4.png
Binary file not shown.
Binary file removed FeatureService/data/MAD2012_259_4.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD2012_259_5.png
Binary file not shown.
Binary file removed FeatureService/data/MAD2012_259_5.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD2012_259_6.png
Binary file not shown.
Binary file removed FeatureService/data/MAD2012_259_6.wav
Binary file not shown.
Binary file removed FeatureService/data/MAD2012_259_7.png
Binary file not shown.
Binary file removed FeatureService/data/MAD2012_259_7.wav
Binary file not shown.
Binary file removed FeatureService/data/NCRO1_2010_61_1.png
Binary file not shown.
Binary file removed FeatureService/data/NCRO1_2010_61_1.wav
Binary file not shown.
Binary file removed FeatureService/data/NCRO1_2010_61_2.png
Binary file not shown.
Binary file removed FeatureService/data/NCRO1_2010_61_2.wav
Binary file not shown.
Binary file removed FeatureService/data/NCRO1_2010_61_3.png
Binary file not shown.
Binary file removed FeatureService/data/NCRO1_2010_61_3.wav
Binary file not shown.
Binary file removed FeatureService/data/NCRO1_2010_61_4.png
Binary file not shown.
Binary file removed FeatureService/data/NCRO1_2010_61_4.wav
Binary file not shown.
Binary file removed FeatureService/data/NCRO1_2010_61_5.png
Diff not rendered.
Binary file removed FeatureService/data/NCRO1_2010_61_5.wav
Binary file not shown.
Binary file removed FeatureService/data/NCRO1_2010_61_6.png
Diff not rendered.
Binary file removed FeatureService/data/NCRO1_2010_61_6.wav
Binary file not shown.
Binary file removed FeatureService/data/NCRO1_2010_61_7.png
Diff not rendered.
Binary file removed FeatureService/data/NCRO1_2010_61_7.wav
Binary file not shown.
Binary file removed FeatureService/data/NCRO1_2010_80_1.png
Diff not rendered.
Binary file removed FeatureService/data/NCRO1_2010_80_1.wav
Binary file not shown.
Binary file removed FeatureService/data/NCRO1_2010_80_2.png
Diff not rendered.
Binary file removed FeatureService/data/NCRO1_2010_80_2.wav
Binary file not shown.
Binary file removed FeatureService/data/NCRO1_2010_80_3.png
Diff not rendered.
Binary file removed FeatureService/data/NCRO1_2010_80_3.wav
Binary file not shown.
Binary file removed FeatureService/data/NCRO1_2010_80_4.png
Diff not rendered.
Binary file removed FeatureService/data/NCRO1_2010_80_4.wav
Binary file not shown.
Binary file removed FeatureService/data/NCRO1_2010_80_5.png
Diff not rendered.
Binary file removed FeatureService/data/NCRO1_2010_80_5.wav
Binary file not shown.
Binary file removed FeatureService/data/NCRO1_2010_80_6.png
Diff not rendered.
Binary file removed FeatureService/data/NCRO1_2010_80_6.wav
Binary file not shown.
Binary file removed FeatureService/data/NCRO1_2010_80_7.png
Diff not rendered.
Binary file removed FeatureService/data/NCRO1_2010_80_7.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_0247_1.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_0247_1.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_0247_2.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_0247_2.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_0247_3.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_0247_3.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_0247_4.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_0247_4.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_0247_5.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_0247_5.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_0247_6.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_0247_6.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_0247_7.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_0247_7.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_286_1.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_286_1.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_286_2.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_286_2.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_286_3.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_286_3.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_286_4.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_286_4.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_286_5.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_286_5.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_286_6.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_286_6.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_286_7.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_286_7.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_351_1.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_351_1.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_351_2.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_351_2.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_351_3.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_351_3.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_351_4.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_351_4.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_351_5.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_351_5.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_351_6.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_351_6.wav
Binary file not shown.
Binary file removed FeatureService/data/NEAMS15_351_7.png
Diff not rendered.
Binary file removed FeatureService/data/NEAMS15_351_7.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER12_232_1.png
Diff not rendered.
Binary file removed FeatureService/data/WKER12_232_1.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER12_232_2.png
Diff not rendered.
Binary file removed FeatureService/data/WKER12_232_2.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER12_232_3.png
Diff not rendered.
Binary file removed FeatureService/data/WKER12_232_3.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER12_232_4.png
Diff not rendered.
Binary file removed FeatureService/data/WKER12_232_4.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER12_232_5.png
Diff not rendered.
Binary file removed FeatureService/data/WKER12_232_5.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER12_232_6.png
Diff not rendered.
Binary file removed FeatureService/data/WKER12_232_6.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER12_232_7.png
Diff not rendered.
Binary file removed FeatureService/data/WKER12_232_7.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_118_1_1.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_118_1_1.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_118_1_2.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_118_1_2.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_118_1_3.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_118_1_3.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_118_1_4.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_118_1_4.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_118_1_5.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_118_1_5.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_118_1_6.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_118_1_6.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_118_1_7.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_118_1_7.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_118_2_1.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_118_2_1.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_118_2_2.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_118_2_2.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_118_2_3.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_118_2_3.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_118_2_4.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_118_2_4.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_118_2_5.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_118_2_5.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_118_2_6.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_118_2_6.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_118_2_7.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_118_2_7.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_1261_1.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_1261_1.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_1261_2.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_1261_2.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_1261_3.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_1261_3.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_1261_4.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_1261_4.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_1261_5.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_1261_5.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_1261_6.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_1261_6.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_1261_7.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_1261_7.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_178_1.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_178_1.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_178_2.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_178_2.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_178_3.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_178_3.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_178_4.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_178_4.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_178_5.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_178_5.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_178_6.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_178_6.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_178_7.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_178_7.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_283_1.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_283_1.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_283_2.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_283_2.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_283_3.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_283_3.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_283_4.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_283_4.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_283_5.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_283_5.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_283_6.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_283_6.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER15_283_7.png
Diff not rendered.
Binary file removed FeatureService/data/WKER15_283_7.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER16_756_1.png
Diff not rendered.
Binary file removed FeatureService/data/WKER16_756_1.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER16_756_2.png
Diff not rendered.
Binary file removed FeatureService/data/WKER16_756_2.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER16_756_3.png
Diff not rendered.
Binary file removed FeatureService/data/WKER16_756_3.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER16_756_4.png
Diff not rendered.
Binary file removed FeatureService/data/WKER16_756_4.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER16_756_5.png
Diff not rendered.
Binary file removed FeatureService/data/WKER16_756_5.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER16_756_6.png
Diff not rendered.
Binary file removed FeatureService/data/WKER16_756_6.wav
Binary file not shown.
Binary file removed FeatureService/data/WKER16_756_7.png
Diff not rendered.
Binary file removed FeatureService/data/WKER16_756_7.wav
Binary file not shown.
67 changes: 0 additions & 67 deletions FeatureService/data/init.js

This file was deleted.

4 changes: 1 addition & 3 deletions FrontApp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ FROM node:9.2.0

WORKDIR /opt

RUN git clone --single-branch -b feature/add-annotations https://github.com/rvovard/FrontApp
RUN git clone --single-branch -b master https://github.com/Project-ODE/FrontApp

WORKDIR /opt/FrontApp

RUN git submodule update --init

RUN npm install

RUN echo "REACT_APP_API_URL=http://localhost:7231/data.ode.org/v1" > .env.production.local
Expand Down
23 changes: 12 additions & 11 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
# ODE docker compose file
# Copyright (C) 2018 Project-ODE
# Copyright (C) 2019 Project-ODE

version: '3.5'
services:
testdb:
db:
image: mdillon/postgis
environment:
- POSTGRES_USER=test
- POSTGRES_USER=postgres
networks:
- db
- netdb

feature_service:
build: FeatureService
depends_on:
- testdb
- db
ports:
- "7231:7231"
environment:
- NODE_ENV=test
volumes:
- ./volumes/db_seeds:/opt/FeatureService/db/seeds
- ./volumes/annotator_resources:/opt/FeatureService/resources/annotator
command: bash -c "sleep 5; knex migrate:latest && knex seed:run && npm start"
networks:
- db
- netdb

front_app:
build: FrontApp
Expand All @@ -30,8 +31,8 @@ services:
- "5000:5000"
command: serve -s build
networks:
- front
- netfront

networks:
front:
db:
netfront:
netdb:
Empty file.
Empty file added volumes/db_seeds/.keep
Empty file.

0 comments on commit 453545a

Please sign in to comment.