Browse Source

- remove unnecessary volumes defines in general docker-compose yml file

- remove php73 in docker compose yml example file
* use only modern composer auth store path
master
dimti 2 years ago
parent
commit
829107e5f5
  1. 17
      docker-compose.base.yml
  2. 27
      docker-compose.yml.example

17
docker-compose.base.yml

@ -67,6 +67,11 @@ services:
MYSQL_ROOT_PASSWORD: 123456 MYSQL_ROOT_PASSWORD: 123456
ports: ports:
- "3306:3306" - "3306:3306"
volumes:
- database:/var/lib/mysql
- ./hostfiles:/hostfiles
- ./log/mariadb:/var/log/mariadb
- ./config/mariadb:/etc/mysql/conf.d
pma: pma:
image: phpmyadmin/phpmyadmin image: phpmyadmin/phpmyadmin
restart: always restart: always
@ -82,15 +87,3 @@ services:
command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ] command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ]
volumes: volumes:
- ./config/redis/redis.conf:/usr/local/etc/redis/redis.conf - ./config/redis/redis.conf:/usr/local/etc/redis/redis.conf
# Must be copied into main docker-compose yml-file
volumes:
database:
secrets:
user_ssh_key:
file: ~/.ssh/id_rsa
user_known_hosts:
file: ~/.ssh/known_hosts
composer_auth:
file: ~/.config/composer/auth.json

27
docker-compose.yml.example

@ -9,12 +9,6 @@ services:
default: default:
aliases: aliases:
- loc.yoursite.ru - loc.yoursite.ru
php73:
extends:
file: docker-compose.base.yml
service: php
build:
dockerfile: php73.Dockerfile
php74: php74:
extends: extends:
file: docker-compose.base.yml file: docker-compose.base.yml
@ -27,26 +21,12 @@ services:
service: php service: php
build: build:
dockerfile: php81.Dockerfile dockerfile: php81.Dockerfile
workspace73:
extends:
file: docker-compose.base.yml
service: workspace
build:
dockerfile: workspace73.Dockerfile
secrets:
- user_ssh_key
- user_known_hosts
- composer_auth1
workspace74: workspace74:
extends: extends:
file: docker-compose.base.yml file: docker-compose.base.yml
service: workspace service: workspace
build: build:
dockerfile: workspace74.Dockerfile dockerfile: workspace74.Dockerfile
secrets:
- user_ssh_key
- user_known_hosts
- composer_auth1
workspace81: workspace81:
extends: extends:
file: docker-compose.base.yml file: docker-compose.base.yml
@ -61,9 +41,6 @@ services:
extends: extends:
file: docker-compose.base.yml file: docker-compose.base.yml
service: db service: db
volumes:
- database:/var/lib/mysql
- ./hostfiles:/hostfiles
pma: pma:
extends: extends:
file: docker-compose.base.yml file: docker-compose.base.yml
@ -85,7 +62,5 @@ secrets:
file: ~/.ssh/id_rsa file: ~/.ssh/id_rsa
user_known_hosts: user_known_hosts:
file: ~/.ssh/known_hosts file: ~/.ssh/known_hosts
composer1_auth:
file: ~/.composer/auth.json
composer2_auth:
composer_auth:
file: ~/.config/composer/auth.json file: ~/.config/composer/auth.json
Loading…
Cancel
Save