Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
webservices
cern-search
cern-search-rest-api
Commits
d0390e18
Commit
d0390e18
authored
Mar 23, 2020
by
Carina Antunes
Browse files
[
SEARCH-47
] Bump tika to 1.24
parent
8515c04f
Changes
7
Hide whitespace changes
Inline
Side-by-side
Dockerfile
View file @
d0390e18
...
...
@@ -7,7 +7,7 @@
# under the terms of the MIT License; see LICENSE file for more details.
# Use CentOS7:
FROM
gitlab-registry.cern.ch/webservices/cern-search/cern-search-rest-api/cern-search-rest-api-base:
9f21df59fb0015f4ec19b4521b4ef3bfb5ec54b
2
FROM
gitlab-registry.cern.ch/webservices/cern-search/cern-search-rest-api/cern-search-rest-api-base:
c1bddb6006266dfa83319a44c3ca7d219e11779
2
ARG
build_env
# CERN Search installation
...
...
Pipfile
View file @
d0390e18
...
...
@@ -42,7 +42,7 @@ invenio-records-files = "<1.3.0,>=1.2.0"
invenio-celery
=
"<1.2.0,>=1.1.0"
invenio-files-rest
=
">=1.0.5,<1.1.0"
gevent
=
">=1.4.0"
invenio-files-processor
=
{
extras
=
["tika"]
,
git
=
"https://github.com/carantunes/invenio-files-processor.git"
,
ref
=
"1.0.
0
-alpha"
}
invenio-files-processor
=
{
extras
=
["tika"]
,
git
=
"https://github.com/carantunes/invenio-files-processor.git"
,
ref
=
"1.0.
2
-alpha"
}
Werkzeug
=
">=0.15,<1.0.0"
pip
=
"*"
eventlet
=
"*"
...
...
Pipfile.lock
View file @
d0390e18
{
"_meta"
:
{
"hash"
:
{
"sha256"
:
"
1fd060af5b2e4ad91145b2daaf03122a0c8cc61142cbc4b05ecc41f9c76eb444
"
"sha256"
:
"
061e60378237ec14c4df7d171c8606c13f3949164a2898ac854ef84ff87f7be5
"
},
"pipfile-spec"
:
6
,
"requires"
:
{
...
...
@@ -18,9 +18,9 @@
"default"
:
{
"alembic"
:
{
"hashes"
:
[
"sha256:
791a5686953c4b366d3228c5377196db2f534475bb38d26f70eb69668efd9028
"
"sha256:
035ab00497217628bf5d0be82d664d8713ab13d37b630084da8e1f98facf4dbf
"
],
"version"
:
"==1.4.
1
"
"version"
:
"==1.4.
2
"
},
"amqp"
:
{
"hashes"
:
[
...
...
@@ -563,7 +563,7 @@
"tika"
],
"git"
:
"https://github.com/carantunes/invenio-files-processor.git"
,
"ref"
:
"
75a86ca1e13259dee615299f3c4d612b2261501b
"
"ref"
:
"
8fdcc48b4c3814ac4239597bca12a41840f9d584
"
},
"invenio-files-rest"
:
{
"hashes"
:
[
...
...
@@ -1250,10 +1250,10 @@
},
"wcwidth"
:
{
"hashes"
:
[
"sha256:
8fd29383f539be45b20bd4df0dc29c20ba48654a41e661925e612311e9f3c603
"
,
"sha256:
f28b3e8a6483e5d49e7f8949ac1a78314e740333ae305b4ba5defd3e74fb37a8
"
"sha256:
cafe2186b3c009a04067022ce1dcd79cb38d8d65ee4f4791b8888d6599d1bbe1
"
,
"sha256:
ee73862862a156bf77ff92b09034fc4825dd3af9cf81bc5b360668d425f3c5f1
"
],
"version"
:
"==0.1.
8
"
"version"
:
"==0.1.
9
"
},
"webargs"
:
{
"hashes"
:
[
...
...
@@ -1549,10 +1549,10 @@
},
"pytest-flask"
:
{
"hashes"
:
[
"sha256:
44948d3feab48c69e89b087129cc4db66bad9cb5aa472c08dfc798c69f4eac6
7"
,
"sha256:
4d5678a045c07317618d80223ea124e21e8acc89dae109542dd1fdf6783d96c2
"
"sha256:
9001f6128c5c4a0d243ce46c117f3691052828d2faf39ac151b8388657dce44
7"
,
"sha256:
cbd8c5b9f8f1b83e9c159ac4294964807c4934317a5fba181739ac15e1b823e6
"
],
"version"
:
"==
1.0.0
"
"version"
:
"==
0.15.1
"
},
"pytest-invenio"
:
{
"hashes"
:
[
...
...
@@ -1607,10 +1607,10 @@
},
"wcwidth"
:
{
"hashes"
:
[
"sha256:
8fd29383f539be45b20bd4df0dc29c20ba48654a41e661925e612311e9f3c603
"
,
"sha256:
f28b3e8a6483e5d49e7f8949ac1a78314e740333ae305b4ba5defd3e74fb37a8
"
"sha256:
cafe2186b3c009a04067022ce1dcd79cb38d8d65ee4f4791b8888d6599d1bbe1
"
,
"sha256:
ee73862862a156bf77ff92b09034fc4825dd3af9cf81bc5b360668d425f3c5f1
"
],
"version"
:
"==0.1.
8
"
"version"
:
"==0.1.
9
"
},
"werkzeug"
:
{
"hashes"
:
[
...
...
docker-compose.full.yml
View file @
d0390e18
...
...
@@ -48,7 +48,7 @@ services:
command
:
[
"
/bin/bash"
,
"
-c"
,
"
celery
worker
-A
${WORKER_APP}
-
-loglevel=${CELERY_LOG_LEVEL}
--autoscale=1000,500
--without-gossip
--without-mingle
--pool=gevent
"
"
celery
worker
-A
${WORKER_APP}
-
l
DEBUG
--autoscale=10,1
"
]
healthcheck
:
test
:
[
"
CMD"
,
"
celery
inspect
ping
-A
${WORKER_APP}
-d
celery@$$(hostname)"
]
...
...
@@ -154,7 +154,7 @@ services:
-
default
tika
:
image
:
logicalspark/docker-tikaserver
:1.2
3
image
:
apache/tika
:1.2
4
ports
:
-
"
9998:9998"
networks
:
...
...
docker-compose.test.yml
View file @
d0390e18
...
...
@@ -159,7 +159,7 @@ services:
-
default
tika
:
image
:
apache/tika:1.2
3
image
:
apache/tika:1.2
4
ports
:
-
"
9998:9998"
networks
:
...
...
docker-compose.yml
View file @
d0390e18
...
...
@@ -72,7 +72,7 @@ services:
start_period
:
20s
tika
:
image
:
logicalspark/docker-tikaserver
:1.2
3
image
:
apache/tika
:1.2
4
ports
:
-
"
9998:9998"
networks
:
...
...
scripts/pipenv/server
View file @
d0390e18
...
...
@@ -14,7 +14,7 @@ readonly TLS_DIR="$SCRIPT_PATH/../../nginx/tls"
export
FLASK_ENV
=
development
# Start Worker
pipenv run celery worker
-A
invenio_app.celery
-l
INFO
--autoscale
=
10
00,500
--without-gossip
--without-mingle
--pool
=
gevent
&
pid_celery
=
$!
pipenv run celery worker
-A
invenio_app.celery
-l
DEBUG
--autoscale
=
10
,1
&
pid_celery
=
$!
# Start Server
invenio run
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment