* simplify elastic container names
* turn on redis extension on workspace
This commit is contained in:
@ -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
|
||||
|
@ -1,22 +1,22 @@
|
||||
version: '3.6'
|
||||
|
||||
services:
|
||||
elasticsearch732:
|
||||
elastic732:
|
||||
extends:
|
||||
file: docker-compose.elasticsearch.base.yml
|
||||
service: elasticsearch
|
||||
file: docker-compose.elastic.base.yml
|
||||
service: elastic
|
||||
build:
|
||||
dockerfile: elastic732.Dockerfile
|
||||
volumes:
|
||||
- elastic732:/usr/share/elasticsearch/data
|
||||
elasticsearch752:
|
||||
- elastic732:/usr/share/elastic/data
|
||||
elastic752:
|
||||
extends:
|
||||
file: docker-compose.elasticsearch.base.yml
|
||||
service: elasticsearch
|
||||
file: docker-compose.elastic.base.yml
|
||||
service: elastic
|
||||
build:
|
||||
dockerfile: elastic752.Dockerfile
|
||||
volumes:
|
||||
- elastic752:/usr/share/elasticsearch/data
|
||||
- elastic752:/usr/share/elastic/data
|
||||
|
||||
volumes:
|
||||
elastic732:
|
||||
|
@ -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
|
@ -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
|
@ -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
|
||||
###########################################################################
|
||||
|
@ -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
|
||||
###########################################################################
|
||||
|
Reference in New Issue
Block a user