Revert "Fix issue for ES jobs CI failures"

This reverts commit 5d4fde1. Signed-off-by: Ashmita Bohara <[email protected]>
jaegertracing · Dec 2, 2020 · ebc72f4 · ebc72f4
1 parent 5d4fde1
commit ebc72f4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git 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
@@ -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