rjawor/concordia-docker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added lemmagen

Browse Source
This commit is contained in:
rjawor 2019-05-15 21:19:00 +02:00
parent f52815c25d
commit 24b3eea2a0
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile → concordia-server/Dockerfile
View File

@ -1,7 +1,7 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
RUN apt-get update && apt-get install -y git libfcgi-dev libpq-dev mono-complete python3-psycopg2 nginx php apache2 libapache2-mod-php spawn-fcgi cmake g++ libboost-dev libboost-serialization-dev libboost-test-dev libboost-filesystem-dev libboost-system-dev libboost-program-options-dev libboost-iostreams-dev libboost-regex-dev libboost-locale-dev liblog4cpp5-dev libconfig++-dev libconfig-dev libpcre3-dev RUN apt-get update && apt-get install -y git libfcgi-dev libpq-dev python3-psycopg2 nginx php apache2 libapache2-mod-php spawn-fcgi cmake g++ libboost-dev libboost-serialization-dev libboost-test-dev libboost-filesystem-dev libboost-system-dev libboost-program-options-dev libboost-iostreams-dev libboost-regex-dev libboost-locale-dev liblog4cpp5-dev libconfig++-dev libconfig-dev libpcre3-dev
RUN git clone https://git.code.sf.net/p/tmconcordia/code RUN git clone https://git.code.sf.net/p/tmconcordia/code
RUN cd code && mkdir build && cd build && ../cmake.sh && make && make install && ldconfig RUN cd code && mkdir build && cd build && ../cmake.sh && make && make install && ldconfig
RUN git clone https://git.wmi.amu.edu.pl/rjawor/concordia-server.git RUN git clone https://git.wmi.amu.edu.pl/rjawor/concordia-server.git

7
docker-compose.yml
View File

@ -13,7 +13,12 @@ services:
POSTGRES_PASSWORD: webpassword POSTGRES_PASSWORD: webpassword
POSTGRES_DB: backend_db POSTGRES_DB: backend_db
concordia-server: concordia-server:
build: . build: ./concordia-server
container_name: concordia-server container_name: concordia-server
ports: ports:
- "10002:80" - "10002:80"
lemmagen:
build: ./lemmagen
container_name: lemmagen
restart: always

6
lemmagen/Dockerfile Normal file
View File

@ -0,0 +1,6 @@
FROM ubuntu:16.04
RUN apt-get update && apt-get -y install git mono-runtime
RUN git clone https://git.wmi.amu.edu.pl/rjawor/lemmagen-wrapper.git
CMD mono /lemmagen-wrapper/LemmaGenSockets/LemmaGenSockets/bin/Debug/LemmaGenSockets.exe

1
todo
View File

@ -2,3 +2,4 @@
2. Rebuild docker-compose and check if concordia-server connects to db via internal "docker-compose" network 2. Rebuild docker-compose and check if concordia-server connects to db via internal "docker-compose" network
3. do not expose concordia-postgres ports if the above works 3. do not expose concordia-postgres ports if the above works
4. Move scripts in the tests folder of concordia-server repo to the concordia-docker. Adjust them accordingly (host, port) 4. Move scripts in the tests folder of concordia-server repo to the concordia-docker. Adjust them accordingly (host, port)
5. sort out the lemmagen