From 6982fd4279f4e4ccae3fa2af588c0cf858f82c74 Mon Sep 17 00:00:00 2001
From: leszeks <leszeks@e-science.pl>
Date: Tue, 15 Sep 2020 16:23:05 +0200
Subject: [PATCH] Dockerfile changes
---
Dockerfile | 46 +++++++++++----------------
config.ini | 1 -
docker-compose.yml | 2 +-
requirements.txt | 2 ++
src/__pycache__/mewex.cpython-36.pyc | Bin 0 -> 3097 bytes
src/mewex.py | 2 ++
6 files changed, 24 insertions(+), 29 deletions(-)
create mode 100644 src/__pycache__/mewex.cpython-36.pyc
diff --git a/Dockerfile b/Dockerfile
index 7e745f3..7973e69 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,14 @@
FROM clarinpl/python:3.6
RUN apt-get update && apt-get install -y --no-install-recommends \
- cmake \
- default-jdk \
+ software-properties-common \
+ build-essential \
+ pwrutils \
corpus2-python3.6 \
wccl-python3.6 \
+ python3.6 \
+ python3.6-dev \
+ default-jdk \
libicu-dev \
libboost1.58-all-dev
@@ -22,47 +26,35 @@ RUN apt-get update && \
ENV JAVA_HOME /opt/jdk
ENV PATH ${PATH}:${JAVA_HOME}/bin
-# installing polem
-# RUN cd .
-# RUN rm /usr/bin/python3
-# RUN ln -s /usr/bin/python3.6 /usr/bin/python3
-# RUN alias python3='/usr/bin/python3.6'
-#RUN apt-get -y install default-jdk
+WORKDIR /home/worker
+COPY ./requirements.txt .
+RUN python3.6 -m pip install -r requirements.txt
+
WORKDIR /build/
RUN git clone https://github.com/gkubon/Polem &&\
- mkdir polem/cpp/build &&\
- cd polem/cpp/build &&\
+ mkdir Polem/build &&\
+ cd Polem/build &&\
cmake .. &&\
make &&\
make install
-# RUN mkdir -p /build/Polem/build
-# COPY . /build/Polem
-# RUN rm /build/Polem/build -rf
-# WORKDIR /build/Polem/build
-# RUN cmake ..
-# RUN make -j
-# RUN make install
-# RUN ldconfig
-# RUN mkdir /data
-# RUN mv /build/Polem/corpus /data
-# WORKDIR /app
#install mewex
-WORKDIR /build
-RUN git clone https://github.com/MGniew/MeWeX.git
-RUN cd MeWeX/mwextractor/mwextractor && \
+WORKDIR /build/
+RUN git clone https://gitlab.clarin-pl.eu/team-semantics/mewex && \
+ cd mewex/mwextractor/mwextractor && \
mkdir build && \
cd build && \
cmake .. && \
make install && \
ldconfig
-RUN cd MeWeX/mewexlib/ && \
+RUN cd mewex && \
+ mkdir mewexlib/mewexlib/data/relations/ontology &&\
+ mv mewexlib/mewexlib/data/relations/*.ccl mewexlib/mewexlib/data/relations/ontology
+RUN cd mewex/mewexlib/ && \
python3.6 setup.py install
WORKDIR /home/worker
COPY ./src ./src
COPY ./main.py .
-COPY ./requirements.txt .
-RUN python3.6 -m pip install -r requirements.txt
CMD ["python3.6", "main.py", "service"]
diff --git a/config.ini b/config.ini
index 383bd81..2504e02 100644
--- a/config.ini
+++ b/config.ini
@@ -7,7 +7,6 @@ rabbit_user = test
rabbit_password = test
queue_prefix =nlp_
-
[tool]
workers_number = 4
diff --git a/docker-compose.yml b/docker-compose.yml
index 96a8916..61235fc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
- main.py
- service
volumes:
- - '/samba:/samba'
+ - './samba:/samba'
- './config.ini:/home/worker/config.ini'
- './src:/home/worker/src'
- './main.py:/home/worker/main.py'
diff --git a/requirements.txt b/requirements.txt
index 57a8aa0..e129cd1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,5 @@
+cmake
+Cython
nlp_ws
lxml
ujson
diff --git a/src/__pycache__/mewex.cpython-36.pyc b/src/__pycache__/mewex.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0bf7670507a6b774028ae07d961c9ffabe191e6f
GIT binary patch
literal 3097
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
UVdP*GU=}cCVq{}vW8`500FKGffdBvi
literal 0
HcmV?d00001
diff --git a/src/mewex.py b/src/mewex.py
index 6bd4bbc..33b2488 100644
--- a/src/mewex.py
+++ b/src/mewex.py
@@ -2,6 +2,7 @@
import os
import re
import io
+import pathlib
import mewexlib as mwl
@@ -20,6 +21,7 @@ class MewexWorker(NLPWorker):
if os.path.isdir(input_path)
else (input_path,)
)
+ print(args['input_files'])
if not os.path.exists(output_path):
os.makedirs(output_path)
args['output_file'] = output_path+"/mewex.csv"
--
GitLab