diff --git a/.env.dist b/.env.dist index 8586525..d0726fc 100644 --- a/.env.dist +++ b/.env.dist @@ -4,3 +4,4 @@ DOCKER_IMAGE_VERSION="3.25" DOCKER_IMAGE=gmouchet/wwwgmo-php-fpm NGINX_PORT=8085 PMA_PORT_WEB=8084 +ELASTIC_VERSION=7.17.19 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 73b37f1..4b2c779 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,63 +3,63 @@ services: ## Linux nginx mysql php - wwwgmo-nginx: - container_name: wwwgmo-nginx - hostname: wwwgmo-nginx - image: nginxinc/nginx-unprivileged:1.23-alpine - volumes: - - './docker/nginx/default.conf:/etc/nginx/conf.d/default.conf' - - './certs:/etc/nginx/certs/' - - './src:/var/www/html:rw,cached' - ports: - - '${NGINX_PORT}:8080' #local:docker - depends_on: - - wwwgmo-php-fpm +# wwwgmo-nginx: +# container_name: wwwgmo-nginx +# hostname: wwwgmo-nginx +# image: nginxinc/nginx-unprivileged:1.23-alpine +# volumes: +# - './docker/nginx/default.conf:/etc/nginx/conf.d/default.conf' +# - './certs:/etc/nginx/certs/' +# - './src:/var/www/html:rw,cached' +# ports: +# - '${NGINX_PORT}:8080' #local:docker +# depends_on: +# - 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: - 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-mariadb: - container_name: wwwgmo-mariadb - hostname: wwwgmo-mariadb - #image: mysql:8.0-debian - #image: mysql/mysql-server:8.0.27-aarch64 - image: mariadb:10.11.7 - 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-mariadb: +# container_name: wwwgmo-mariadb +# hostname: wwwgmo-mariadb +# #image: mysql:8.0-debian +# #image: mysql/mysql-server:8.0.27-aarch64 +# image: mariadb:10.11.7 +# 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: container_name: 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' volumes: - 'wwwgmo-elasticsearch:/usr/share/elasticsearch/data' @@ -83,15 +83,15 @@ services: wwwgmo_kibana: container_name: 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 restart: unless-stopped env_file: - ./docker/kibana/.env ports: - 5601:5601 - depends_on: - - wwwgmo-elasticsearch + #depends_on: + # - wwwgmo-elasticsearch volumes: wwwgmo-mariadb: