* simplify elastic container names

* turn on redis extension on workspace

.gitignore

@@ -1,4 +1,5 @@
 /.idea
 /dockerfiles/ypt-encoder
 /docker-compose.yml
-/.env
+/docker-compose.elastic.yml
+/.env

docker-compose.elastic.base.yml

@@ -1,9 +1,9 @@
 version: '3.6'
 
 services:
-  elasticsearch:
+  elastic:
     build:
-      context: ./dockerfiles/elasticsearch
+      context: ./dockerfiles/elastic
     restart: on-failure
     environment:
       - discovery.type=single-node

docker-compose.elastic.yml

@@ -1,23 +0,0 @@
-version: '3.6'
-
-services:
-  elasticsearch732:
-    extends:
-      file: docker-compose.elasticsearch.base.yml
-      service: elasticsearch
-    build:
-      dockerfile: elastic732.Dockerfile
-    volumes:
-      - elastic732:/usr/share/elasticsearch/data
-  elasticsearch752:
-    extends:
-      file: docker-compose.elasticsearch.base.yml
-      service: elasticsearch
-    build:
-      dockerfile: elastic752.Dockerfile
-    volumes:
-      - elastic752:/usr/share/elasticsearch/data
-
-volumes:
-  elastic732:
-  elastic752:

docker-compose.elastic.yml.example

@@ -0,0 +1,23 @@
+version: '3.6'
+
+services:
+  elastic732:
+    extends:
+      file: docker-compose.elastic.base.yml
+      service: elastic
+    build:
+      dockerfile: elastic732.Dockerfile
+    volumes:
+      - elastic732:/usr/share/elastic/data
+  elastic752:
+    extends:
+      file: docker-compose.elastic.base.yml
+      service: elastic
+    build:
+      dockerfile: elastic752.Dockerfile
+    volumes:
+      - elastic752:/usr/share/elastic/data
+
+volumes:
+  elastic732:
+  elastic752:

dockerfiles/elasticsearch/elastic732.Dockerfile → dockerfiles/elastic/elastic732.Dockerfile

@@ -1,4 +1,5 @@
 # syntax = edrevo/dockerfile-plus
 FROM docker.elastic.co/elasticsearch/elasticsearch:7.3.2
 
-INCLUDE+ ./elastic.base.Dockerfile
+#INCLUDE+ ./elastic.base.Dockerfile
+RUN elasticsearch-plugin install analysis-icu

dockerfiles/elasticsearch/elastic752.Dockerfile → dockerfiles/elastic/elastic752.Dockerfile

@@ -1,4 +1,5 @@
 # syntax = edrevo/dockerfile-plus
 FROM docker.elastic.co/elasticsearch/elasticsearch:7.5.2
 
-INCLUDE+ ./elastic.base.Dockerfile
+#INCLUDE+ ./elastic.base.Dockerfile
+RUN elasticsearch-plugin install analysis-icu

dockerfiles/workspace/workspace73.Dockerfile

@@ -28,6 +28,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN pecl install -a redis
 
+RUN echo "extension=redis.so" > /etc/php/7.3/cli/conf.d/20-redis.ini
+
 ###########################################################################
 # S3 config
 ###########################################################################

dockerfiles/workspace/workspace74.Dockerfile

@@ -29,6 +29,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 #RUN pecl install igbinary && pecl install -a redis
 RUN pecl install -a redis
 
+RUN echo "extension=redis.so" > /etc/php/7.4/cli/conf.d/20-redis.ini
+
 ###########################################################################
 # S3 config
 ###########################################################################