diff --git a/docker-compose.base.yml b/docker-compose.base.yml index 80e0d74..f7471e3 100755 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -67,6 +67,11 @@ services: MYSQL_ROOT_PASSWORD: 123456 ports: - "3306:3306" + volumes: + - database:/var/lib/mysql + - ./hostfiles:/hostfiles + - ./log/mariadb:/var/log/mariadb + - ./config/mariadb:/etc/mysql/conf.d pma: image: phpmyadmin/phpmyadmin restart: always @@ -82,15 +87,3 @@ services: command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ] volumes: - ./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 diff --git a/docker-compose.yml.example b/docker-compose.yml.example index 39a51cd..c618121 100755 --- a/docker-compose.yml.example +++ b/docker-compose.yml.example @@ -9,12 +9,6 @@ services: default: aliases: - loc.yoursite.ru - php73: - extends: - file: docker-compose.base.yml - service: php - build: - dockerfile: php73.Dockerfile php74: extends: file: docker-compose.base.yml @@ -27,26 +21,12 @@ services: service: php build: 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: extends: file: docker-compose.base.yml service: workspace build: dockerfile: workspace74.Dockerfile - secrets: - - user_ssh_key - - user_known_hosts - - composer_auth1 workspace81: extends: file: docker-compose.base.yml @@ -61,9 +41,6 @@ services: extends: file: docker-compose.base.yml service: db - volumes: - - database:/var/lib/mysql - - ./hostfiles:/hostfiles pma: extends: file: docker-compose.base.yml @@ -85,7 +62,5 @@ secrets: file: ~/.ssh/id_rsa user_known_hosts: file: ~/.ssh/known_hosts - composer1_auth: - file: ~/.composer/auth.json - composer2_auth: + composer_auth: file: ~/.config/composer/auth.json