From ebc72f4fa90df75395ba3f5fbdeaa8d831feed2f Mon Sep 17 00:00:00 2001 From: Ashmita Bohara Date: Wed, 2 Dec 2020 20:43:58 +0800 Subject: [PATCH] Revert "Fix issue for ES jobs CI failures" This reverts commit 5d4fde1f0ba19f7ce0fdf3c88475b32b8654d84f. Signed-off-by: Ashmita Bohara --- plugin/storage/es/Dockerfile | 7 ++++--- plugin/storage/es/Dockerfile.rollover | 7 ++++--- plugin/storage/es/requirements.txt | 3 --- 3 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 plugin/storage/es/requirements.txt diff --git a/plugin/storage/es/Dockerfile b/plugin/storage/es/Dockerfile index f9cc7193fb8..5fd9fc8b65e 100644 --- a/plugin/storage/es/Dockerfile +++ b/plugin/storage/es/Dockerfile @@ -1,8 +1,9 @@ FROM python:3-alpine3.11 -COPY esCleaner.py /es-index-cleaner/ -COPY requirements.txt /es-index-cleaner/ +# Temporary fix for https://github.com/jaegertracing/jaeger/issues/1494 +RUN pip install urllib3==1.24.3 -RUN pip install -r /es-index-cleaner/requirements.txt +RUN pip install elasticsearch elasticsearch-curator +COPY esCleaner.py /es-index-cleaner/ ENTRYPOINT ["python3", "/es-index-cleaner/esCleaner.py"] diff --git a/plugin/storage/es/Dockerfile.rollover b/plugin/storage/es/Dockerfile.rollover index e363a65cd11..2be8b3064c8 100644 --- a/plugin/storage/es/Dockerfile.rollover +++ b/plugin/storage/es/Dockerfile.rollover @@ -1,9 +1,10 @@ FROM python:3-alpine3.11 +# Temporary fix for https://github.com/jaegertracing/jaeger/issues/1494 +RUN pip install urllib3==1.24.3 + +RUN pip install elasticsearch elasticsearch-curator pathlib2 COPY ./mappings/* /mappings/ COPY esRollover.py /es-rollover/ -COPY requirements.txt /es-rollover/ - -RUN pip install -r /es-rollover/requirements.txt ENTRYPOINT ["python3", "/es-rollover/esRollover.py"] diff --git a/plugin/storage/es/requirements.txt b/plugin/storage/es/requirements.txt deleted file mode 100644 index ffb280cabba..00000000000 --- a/plugin/storage/es/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -elasticsearch==7.10.0 -elasticsearch-curator==5.8.3 -urllib3==1.24.3 # Temporary fix for https://github.com/jaegertracing/jaeger/issues/1494