Browse Source

* simplify elastic container names

* turn on redis extension on workspace
master
Anton 7 months ago
parent
commit
5f1e9498c8
  1. 4
      docker-compose.elastic.base.yml
  2. 16
      docker-compose.elastic.yml.example
  3. 0
      dockerfiles/elastic/elastic.base.Dockerfile
  4. 3
      dockerfiles/elastic/elastic732.Dockerfile
  5. 3
      dockerfiles/elastic/elastic752.Dockerfile
  6. 2
      dockerfiles/workspace/workspace73.Dockerfile
  7. 2
      dockerfiles/workspace/workspace74.Dockerfile

4
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

16
docker-compose.elastic.yml.example

@ -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:

0
dockerfiles/elasticsearch/elastic.base.Dockerfile → dockerfiles/elastic/elastic.base.Dockerfile

3
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

3
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

2
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
###########################################################################

2
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
###########################################################################

Loading…
Cancel
Save