diff --git a/concordia-aligner/align_corpus.sh b/concordia-aligner/align_corpus.sh index 0f8e254..6f3defb 100755 --- a/concordia-aligner/align_corpus.sh +++ b/concordia-aligner/align_corpus.sh @@ -1,3 +1,3 @@ #!/bin/sh -docker run -it --rm --name=concordia-aligner --network=concordia-docker_default --mount src="$(pwd)"/corpora,target=/concordia-aligner/corpora,type=bind concordia-aligner:Dockerfile cd concordia-aligner && make clean && make \ No newline at end of file +docker run -it --rm --name=concordia-aligner --network=concordiadocker_default --mount src="$(pwd)"/corpora,target=/concordia-aligner/corpora,type=bind concordia-aligner:Dockerfile cd concordia-aligner && make clean && make \ No newline at end of file diff --git a/concordia-preprocessor/Dockerfile b/concordia-preprocessor/Dockerfile index 59ef83b..f798642 100644 --- a/concordia-preprocessor/Dockerfile +++ b/concordia-preprocessor/Dockerfile @@ -8,14 +8,10 @@ ENV LANG pl_PL.UTF-8 ENV LANGUAGE pl_PL:pl ENV LC_ALL pl_PL.UTF-8 -RUN add-apt-repository 'deb http://sgjp.pl/apt/ubuntu-xenial xenial main' && apt-get update -RUN apt-get install --allow-unauthenticated -y git python3 python3-pip morfeusz2 +RUN apt-get install -y git python3 python3-pip RUN pip3 install flask flask_restful gunicorn requests spacy RUN python3 -m spacy download en -COPY python3-morfeusz2_0.4.0-1_amd64.deb / -RUN dpkg -i python3-morfeusz2_0.4.0-1_amd64.deb - RUN git clone https://git.wmi.amu.edu.pl/rjawor/concordia-preprocessor.git -CMD cd concordia-preprocessor && ./start_concraft_server.sh && ./start_concordia_preprocessor.sh \ No newline at end of file +CMD cd concordia-preprocessor && ./start_concordia_preprocessor.sh \ No newline at end of file diff --git a/concordia-preprocessor/python3-morfeusz2_0.4.0-1_amd64.deb b/concordia-preprocessor/python3-morfeusz2_0.4.0-1_amd64.deb deleted file mode 100644 index c35e483..0000000 Binary files a/concordia-preprocessor/python3-morfeusz2_0.4.0-1_amd64.deb and /dev/null differ diff --git a/docker-compose.yml b/docker-compose.yml index 5054e93..2320e48 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.1' +version: '2.0' services: