From bd765f7cb4188063d43d4650c50ddbd44e8b32da Mon Sep 17 00:00:00 2001
From: Tasos Katsoulas <akatsoulas@gmail.com>
Date: Thu, 6 Aug 2020 16:37:50 +0300
Subject: [PATCH] Bump ES7 to version 7.8.1

* Fix typo in Dockerfile
* Expose ES* ports.
---
 Dockerfile           |  2 +-
 docker-compose.yml   | 24 +++++++++---------------
 requirements/es7.txt |  6 +++---
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e41a4a86b..a4dc6e865 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,7 +39,7 @@ COPY ./requirements/*.txt /app/requirements/
 RUN pip install --no-cache-dir --require-hashes -r requirements/default.txt && \
     pip install --no-cache-dir --require-hashes -r requirements/dev.txt && \
     pip install --no-cache-dir --require-hashes -r requirements/test.txt && \
-    pip install --no-cache-dir --require-hashes --no-deps -t /venodr -r requirements/es7.txt
+    pip install --no-cache-dir --require-hashes --no-deps -t /vendor -r requirements/es7.txt
 
 ARG GIT_SHA=head
 ENV GIT_SHA=${GIT_SHA}
diff --git a/docker-compose.yml b/docker-compose.yml
index d8f9a426d..064406e24 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.4'
+version: "3.4"
 services:
   web:
     image: itsre/sumo-kitsune:base-dev-${GIT_COMMIT_SHORT:-latest}
@@ -15,7 +15,6 @@ services:
       - elasticsearch7
       - redis
       - celery
-      - celery-fxa
       - celery-flower
       - celery-beat
       - mailcatcher
@@ -142,11 +141,17 @@ services:
 
   elasticsearch:
     image: elasticsearch:2.4
+    ports:
+      - "9201:9200"
+      - "9301:9300"
 
   elasticsearch7:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.3.2
+    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.8.1
     environment:
       - discovery.type=single-node
+    ports:
+      - "9200:9200"
+      - "9300:9300"
 
   redis:
     image: redis:3
@@ -162,17 +167,6 @@ services:
       - mariadb
       - redis
 
-  celery-fxa:
-    image: itsre/sumo-kitsune:base-dev-${GIT_COMMIT_SHORT:-latest}
-    command: celery -A kitsune worker -Q fxa -l info -n fxa@%h
-    env_file: .env
-    volumes:
-      - ./:/app:delegated
-    user: ${UID:-kitsune}
-    depends_on:
-      - mariadb
-      - redis
-
   celery-flower:
     image: itsre/sumo-kitsune:base-dev-${GIT_COMMIT_SHORT:-latest}
     command: celery -A kitsune flower -l info --address=0.0.0.0 --port=5555
@@ -203,4 +197,4 @@ services:
       - "1080:1080"
 
 volumes:
-    mysqlvolume:
+  mysqlvolume:
diff --git a/requirements/es7.txt b/requirements/es7.txt
index 65f87603d..9cc14fb2d 100644
--- a/requirements/es7.txt
+++ b/requirements/es7.txt
@@ -1,6 +1,6 @@
-elasticsearch==7.8.0 \
-    --hash=sha256:6fb566dd23b91b5871ce12212888674b4cf33374e92b71b1080916c931e44dcb \
-    --hash=sha256:e637d8cf4e27e279b5ff8ca8edc0c086f4b5df4bf2b48e2f950b7833aca3a792
+elasticsearch==7.8.1 \
+    --hash=sha256:2ffbd746fc7d2db08e5ede29c822483705f29c4bf43b0875c238637d5d843d44 \
+    --hash=sha256:92b534931865a186906873f75ae0b91808ff5036b0f2b9269eb5f6dc09644b55
 elasticsearch-dsl==7.2.1 \
     --hash=sha256:1e345535164cb684de4b825e1d0daf81b75554b30d3905446584a9e4af0cc3e7 \
     --hash=sha256:593c01822a03e3e84b87753c78edb833f4b2bfafcd52089841bd8f99b7e74ccd