From 705acd65255310ca6876c1107de0550992e55f8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Jaworski?= Date: Thu, 27 Jun 2019 12:53:03 +0200 Subject: [PATCH] clean up --- concordia-aligner/align_corpus.sh | 2 +- concordia-preprocessor/run_development.sh | 6 +++--- concordia-server/Dockerfile | 7 ++++++- concordia-server/run_development.sh | 5 +++++ docker-compose.yml | 15 ++++++++++++++- 5 files changed, 29 insertions(+), 6 deletions(-) create mode 100755 concordia-server/run_development.sh diff --git a/concordia-aligner/align_corpus.sh b/concordia-aligner/align_corpus.sh index 966579a..3773029 100755 --- a/concordia-aligner/align_corpus.sh +++ b/concordia-aligner/align_corpus.sh @@ -2,4 +2,4 @@ source corpus.cfg -docker run -it --rm --name=concordia-aligner --network=concordiadocker_default --mount src="$(pwd)"/corpora,target=/concordia-aligner/corpora,type=bind concordia-aligner:Dockerfile $SRC_LANG $TRG_LANG $CORPUS_NAME +docker run -it --rm --name=concordia-aligner --network=concordia-network --mount src="$(pwd)"/corpora,target=/concordia-aligner/corpora,type=bind concordia-aligner:Dockerfile $SRC_LANG $TRG_LANG $CORPUS_NAME diff --git a/concordia-preprocessor/run_development.sh b/concordia-preprocessor/run_development.sh index dcc163b..81c2650 100755 --- a/concordia-preprocessor/run_development.sh +++ b/concordia-preprocessor/run_development.sh @@ -1,5 +1,5 @@ PREPROCESSOR_SOURCES=`readlink -f ../../concordia-preprocessor` -docker network create concordiadocker_default -docker run -it --rm --network=concordiadocker_default --name=concordia-preprocessor -p 10002:9001 --mount src="$PREPROCESSOR_SOURCES",target=/concordia-preprocessor-remote,type=bind concordiadocker_concordia-preprocessor /bin/bash -docker network remove concordiadocker_default +docker network create concordia-network +docker run -it --rm --network=concordia-network --name=concordia-preprocessor -p 10002:9001 --mount src="$PREPROCESSOR_SOURCES",target=/concordia-preprocessor-remote,type=bind concordia-preprocessor /bin/bash +docker network remove concordia-network diff --git a/concordia-server/Dockerfile b/concordia-server/Dockerfile index 3b3e51e..55ab2cc 100644 --- a/concordia-server/Dockerfile +++ b/concordia-server/Dockerfile @@ -8,12 +8,17 @@ ENV LANG pl_PL.UTF-8 ENV LANGUAGE pl_PL:pl ENV LC_ALL pl_PL.UTF-8 -RUN 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 mono-complete +RUN 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 automake libtool libcurl4-openssl-dev 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 git clone https://github.com/mrtazz/restclient-cpp.git +RUN cd restclient-cpp && ./autogen.sh && make install && ldconfig + RUN git clone https://git.wmi.amu.edu.pl/rjawor/concordia-server.git RUN cd concordia-server && mkdir index && mkdir build && cd build && ../cmake.sh && make + COPY fcgi_concordia /etc/nginx/sites-available RUN rm /etc/nginx/sites-enabled/default RUN ln -s /etc/nginx/sites-available/fcgi_concordia /etc/nginx/sites-enabled/fcgi_concordia diff --git a/concordia-server/run_development.sh b/concordia-server/run_development.sh new file mode 100755 index 0000000..c539d83 --- /dev/null +++ b/concordia-server/run_development.sh @@ -0,0 +1,5 @@ +CONCORDIASERVER_SOURCES=`readlink -f ../../concordia-server` + +docker network create concordia-network +docker run -it --rm --network=concordia-network --name=concordia-server -p 10001:8800 --mount src="$CONCORDIASERVER_SOURCES",target=/concordia-server-remote,type=bind concordia-server /bin/bash +docker network remove concordia-network diff --git a/docker-compose.yml b/docker-compose.yml index 2320e48..ac8d403 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,24 +1,37 @@ -version: '2.0' +version: '3.5' services: concordia-postgres: build: ./concordia-postgres container_name: concordia-postgres + image: concordia-postgres restart: always environment: POSTGRES_DB: concordia_db POSTGRES_USER: concordia POSTGRES_PASSWORD: concordia + networks: + - concordia-network concordia-server: build: ./concordia-server container_name: concordia-server + image: concordia-server restart: always ports: - "10001:8800" depends_on: - "concordia-postgres" + networks: + - concordia-network concordia-preprocessor: build: ./concordia-preprocessor container_name: concordia-preprocessor + image: concordia-preprocessor restart: always + networks: + - concordia-network + +networks: + concordia-network: + name: concordia-network \ No newline at end of file