es version in var

This commit is contained in:
Gilles Mouchet 2025-06-19 15:38:33 +02:00
parent d722c58de7
commit 2729d642cd
2 changed files with 57 additions and 56 deletions

View File

@ -4,3 +4,4 @@ DOCKER_IMAGE_VERSION="3.25"
DOCKER_IMAGE=gmouchet/wwwgmo-php-fpm DOCKER_IMAGE=gmouchet/wwwgmo-php-fpm
NGINX_PORT=8085 NGINX_PORT=8085
PMA_PORT_WEB=8084 PMA_PORT_WEB=8084
ELASTIC_VERSION=7.17.19

View File

@ -3,63 +3,63 @@
services: services:
## Linux nginx mysql php ## Linux nginx mysql php
wwwgmo-nginx: # wwwgmo-nginx:
container_name: wwwgmo-nginx # container_name: wwwgmo-nginx
hostname: wwwgmo-nginx # hostname: wwwgmo-nginx
image: nginxinc/nginx-unprivileged:1.23-alpine # image: nginxinc/nginx-unprivileged:1.23-alpine
volumes: # volumes:
- './docker/nginx/default.conf:/etc/nginx/conf.d/default.conf' # - './docker/nginx/default.conf:/etc/nginx/conf.d/default.conf'
- './certs:/etc/nginx/certs/' # - './certs:/etc/nginx/certs/'
- './src:/var/www/html:rw,cached' # - './src:/var/www/html:rw,cached'
ports: # ports:
- '${NGINX_PORT}:8080' #local:docker # - '${NGINX_PORT}:8080' #local:docker
depends_on: # depends_on:
- wwwgmo-php-fpm # - wwwgmo-php-fpm
##
# wwwgmo-php-fpm:
# container_name: wwwgmo-php-fpm
# hostname: wwwgmo-php-fpm
# #image: wwwgmo
# image: ${DOCKER_IMAGE}:${DOCKER_IMAGE_VERSION}
# env_file:
# - ./docker/php-fpm/.env
# volumes:
# - './src/:/var/www/html:rw,cached'
# build:
# context: .
# dockerfile: ./docker/php-fpm/Dockerfile
# ports:
# - '9000:9000' #local:docker
# depends_on:
# - wwwgmo-mariadb
# #
wwwgmo-php-fpm: # wwwgmo-mariadb:
container_name: wwwgmo-php-fpm # container_name: wwwgmo-mariadb
hostname: wwwgmo-php-fpm # hostname: wwwgmo-mariadb
#image: wwwgmo # #image: mysql:8.0-debian
image: ${DOCKER_IMAGE}:${DOCKER_IMAGE_VERSION} # #image: mysql/mysql-server:8.0.27-aarch64
env_file: # image: mariadb:10.11.7
- ./docker/php-fpm/.env # volumes:
volumes: # - 'wwwgmo-mariadb:/var/lib/mysql:z'
- './src/:/var/www/html:rw,cached' # env_file:
build: # - ./docker/mariadb/.env # ports:
context: . #
dockerfile: ./docker/php-fpm/Dockerfile # wwwgmo-phpmyadmin:
ports: # container_name: wwwgmo-pma
- '9000:9000' #local:docker # image: phpmyadmin
depends_on: # links:
- wwwgmo-mariadb # - wwwgmo-mariadb
# env_file:
wwwgmo-mariadb: # - ./docker/mariadb/.env
container_name: wwwgmo-mariadb # restart: always
hostname: wwwgmo-mariadb # ports:
#image: mysql:8.0-debian # - ${PMA_PORT_WEB}:80
#image: mysql/mysql-server:8.0.27-aarch64 #
image: mariadb:10.11.7 ## EK
volumes:
- 'wwwgmo-mariadb:/var/lib/mysql:z'
env_file:
- ./docker/mariadb/.env # ports:
wwwgmo-phpmyadmin:
container_name: wwwgmo-pma
image: phpmyadmin
links:
- wwwgmo-mariadb
env_file:
- ./docker/mariadb/.env
restart: always
ports:
- ${PMA_PORT_WEB}:80
# EK
wwwgmo-elasticsearch: wwwgmo-elasticsearch:
container_name: wwwgmo-elasticsearch container_name: wwwgmo-elasticsearch
hostname: wwwgmo-elasticsearch hostname: wwwgmo-elasticsearch
image: 'docker.elastic.co/elasticsearch/elasticsearch:7.17.19' image: 'docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION}'
#image: 'docker.elastic.co/elasticsearch/elasticsearch:8.8.1' #image: 'docker.elastic.co/elasticsearch/elasticsearch:8.8.1'
volumes: volumes:
- 'wwwgmo-elasticsearch:/usr/share/elasticsearch/data' - 'wwwgmo-elasticsearch:/usr/share/elasticsearch/data'
@ -83,15 +83,15 @@ services:
wwwgmo_kibana: wwwgmo_kibana:
container_name: wwwgmo-kibana container_name: wwwgmo-kibana
hostname: wwwgmo-kibana hostname: wwwgmo-kibana
image: docker.elastic.co/kibana/kibana:7.17.19 image: docker.elastic.co/kibana/kibana:${ELASTIC_VERSION}
#image: docker.elastic.co/kibana/kibana:8.8.1 #image: docker.elastic.co/kibana/kibana:8.8.1
restart: unless-stopped restart: unless-stopped
env_file: env_file:
- ./docker/kibana/.env - ./docker/kibana/.env
ports: ports:
- 5601:5601 - 5601:5601
depends_on: #depends_on:
- wwwgmo-elasticsearch # - wwwgmo-elasticsearch
volumes: volumes:
wwwgmo-mariadb: wwwgmo-mariadb: