From 9e4b8776d7c69d5ab8fc9a840f58799cdfd10ca0 Mon Sep 17 00:00:00 2001 From: maxpozdeev Date: Sat, 12 Nov 2022 16:35:13 +0300 Subject: [PATCH] keep more space in dev docker by not using dockerfile for mariadb containers --- docker/dev/.gitignore | 6 ++- docker/dev/_mariadb100/my.cnf | 4 ++ docker/dev/_mariadb105/Dockerfile-db | 4 -- docker/dev/_mariadb108/Dockerfile-db | 3 -- docker/dev/mtt-php72-apache-mariadb100/.env | 1 + .../mtt-php72-apache-mariadb100/compose.yml | 47 +++++++++++++++++++ .../mtt-php72-apache-mariadb105/compose.yml | 8 ++-- docker/dev/mtt-php72-apache/compose.yml | 2 +- docker/dev/mtt-php74-apache/compose.yml | 2 +- docker/dev/mtt-php74-nginx/compose.yml | 4 +- .../mtt-php80-apache-mariadb105/compose.yml | 8 ++-- docker/dev/mtt-php80-apache/compose.yml | 2 +- .../mtt-php81-apache-mariadb108/compose.yml | 14 +++--- docker/dev/mtt-php81-apache/compose.yml | 2 +- docker/dev/mtt-php81-nginx/compose.yml | 4 +- docker/dev/mtt-php82-apache/compose.yml | 2 +- 16 files changed, 79 insertions(+), 34 deletions(-) create mode 100644 docker/dev/_mariadb100/my.cnf delete mode 100644 docker/dev/_mariadb105/Dockerfile-db delete mode 100644 docker/dev/_mariadb108/Dockerfile-db create mode 100644 docker/dev/mtt-php72-apache-mariadb100/.env create mode 100644 docker/dev/mtt-php72-apache-mariadb100/compose.yml diff --git a/docker/dev/.gitignore b/docker/dev/.gitignore index d049c7c..6867142 100644 --- a/docker/dev/.gitignore +++ b/docker/dev/.gitignore @@ -1 +1,5 @@ -*/db_data \ No newline at end of file +*/db_data +mtt-php56-apache +mtt-php71-apache +mtt-php72-apache-mariadb055 +_mariadb055 diff --git a/docker/dev/_mariadb100/my.cnf b/docker/dev/_mariadb100/my.cnf new file mode 100644 index 0000000..fa9302b --- /dev/null +++ b/docker/dev/_mariadb100/my.cnf @@ -0,0 +1,4 @@ +[mysqld] +collation-server = utf8mb4_unicode_ci +character-set-server = utf8mb4 +innodb_log_file_size=10M diff --git a/docker/dev/_mariadb105/Dockerfile-db b/docker/dev/_mariadb105/Dockerfile-db deleted file mode 100644 index 276c5fa..0000000 --- a/docker/dev/_mariadb105/Dockerfile-db +++ /dev/null @@ -1,4 +0,0 @@ - -FROM mariadb:10.5 - -COPY my.cnf /etc/mysql/conf.d/ diff --git a/docker/dev/_mariadb108/Dockerfile-db b/docker/dev/_mariadb108/Dockerfile-db deleted file mode 100644 index 54655fb..0000000 --- a/docker/dev/_mariadb108/Dockerfile-db +++ /dev/null @@ -1,3 +0,0 @@ -FROM mariadb:10.8 - -COPY my.cnf /etc/mysql/conf.d/ diff --git a/docker/dev/mtt-php72-apache-mariadb100/.env b/docker/dev/mtt-php72-apache-mariadb100/.env new file mode 100644 index 0000000..ebb4320 --- /dev/null +++ b/docker/dev/mtt-php72-apache-mariadb100/.env @@ -0,0 +1 @@ +PLATFORM_NAME=mtt-dev-php72-apache-mariadb100 diff --git a/docker/dev/mtt-php72-apache-mariadb100/compose.yml b/docker/dev/mtt-php72-apache-mariadb100/compose.yml new file mode 100644 index 0000000..84e0c7b --- /dev/null +++ b/docker/dev/mtt-php72-apache-mariadb100/compose.yml @@ -0,0 +1,47 @@ +version: "3.9" + +networks: + network: + name: "${PLATFORM_NAME}-network" + +services: + web: + build: + context: ../mtt-php72-apache/ + dockerfile: Dockerfile-web + image: mtt-dev/php:7.2-apache + container_name: ${PLATFORM_NAME}-web + ports: + - "8080:80" + environment: + - MTT_ENABLE_DEBUG=YES + - MTT_DB_TYPE=mysql + - MTT_DB_HOST=db + - MTT_DB_NAME=mytinytodo + - MTT_DB_USER=mtt + - MTT_DB_PASSWORD=mtt + - MTT_DB_PREFIX=mtt_ + - MTT_DB_DRIVER=mysqli + volumes: + - ../../../src:/var/www/html + - ../mtt-php72-apache/php-mtt.ini:/usr/local/etc/php/conf.d/php-mtt.ini + - ../mtt-php72-apache/php-opcache.ini:/usr/local/etc/php/conf.d/php-opcache.ini + depends_on: + - db + networks: + - network + + db: + image: mariadb:10.0.15 + container_name: ${PLATFORM_NAME}-db + #restart: always + environment: + MYSQL_ROOT_PASSWORD: JustForDev + MYSQL_USER: mtt + MYSQL_PASSWORD: mtt + MYSQL_DATABASE: mytinytodo + volumes: + - ../_mariadb100/my.cnf:/etc/mysql/conf.d/my.cnf + - ../_mariadb100/db_data:/var/lib/mysql + networks: + - network diff --git a/docker/dev/mtt-php72-apache-mariadb105/compose.yml b/docker/dev/mtt-php72-apache-mariadb105/compose.yml index 72605d5..fd8c7dc 100644 --- a/docker/dev/mtt-php72-apache-mariadb105/compose.yml +++ b/docker/dev/mtt-php72-apache-mariadb105/compose.yml @@ -9,7 +9,7 @@ services: build: context: ../mtt-php72-apache/ dockerfile: Dockerfile-web - image: mytinytodo-dev:php7.2-apache + image: mtt-dev/php:7.2-apache container_name: ${PLATFORM_NAME}-web ports: - "8080:80" @@ -32,10 +32,7 @@ services: - network db: - build: - context: ../_mariadb105 - dockerfile: Dockerfile-db - image: mytinytodo-dev:mariadb10.5 + image: mariadb:10.5 container_name: ${PLATFORM_NAME}-db #restart: always environment: @@ -44,6 +41,7 @@ services: MARIADB_PASSWORD: mtt MARIADB_DATABASE: mytinytodo volumes: + - ../_mariadb105/my.cnf:/etc/mysql/conf.d/my.cnf - ../_mariadb105/db_data:/var/lib/mysql networks: - network diff --git a/docker/dev/mtt-php72-apache/compose.yml b/docker/dev/mtt-php72-apache/compose.yml index 0f52ec9..5244805 100644 --- a/docker/dev/mtt-php72-apache/compose.yml +++ b/docker/dev/mtt-php72-apache/compose.yml @@ -3,7 +3,7 @@ services: build: context: . dockerfile: Dockerfile-web - image: mytinytodo-dev:php7.2-apache + image: mtt-dev/php:7.2-apache container_name: ${PLATFORM_NAME}-web ports: - "8080:80" diff --git a/docker/dev/mtt-php74-apache/compose.yml b/docker/dev/mtt-php74-apache/compose.yml index a3b165f..a555071 100644 --- a/docker/dev/mtt-php74-apache/compose.yml +++ b/docker/dev/mtt-php74-apache/compose.yml @@ -3,7 +3,7 @@ services: build: context: . dockerfile: Dockerfile-web - image: mytinytodo-dev:php7.4-apache + image: mtt-dev/php:7.4-apache container_name: ${PLATFORM_NAME}-web ports: - "8080:80" diff --git a/docker/dev/mtt-php74-nginx/compose.yml b/docker/dev/mtt-php74-nginx/compose.yml index 101ebe4..d4d9cec 100644 --- a/docker/dev/mtt-php74-nginx/compose.yml +++ b/docker/dev/mtt-php74-nginx/compose.yml @@ -9,7 +9,7 @@ services: build: context: ../_nginx dockerfile: Dockerfile-nginx - image: mytinytodo-dev:nginx + image: mtt-dev/nginx container_name: ${PLATFORM_NAME}-web ports: - "8080:80" @@ -24,7 +24,7 @@ services: build: context: . dockerfile: Dockerfile-fpm - image: mytinytodo-dev:php7.4-fpm + image: mtt-dev/php:7.4-fpm container_name: ${PLATFORM_NAME}-fpm hostname: php-fpm environment: diff --git a/docker/dev/mtt-php80-apache-mariadb105/compose.yml b/docker/dev/mtt-php80-apache-mariadb105/compose.yml index ea16209..8230c5c 100644 --- a/docker/dev/mtt-php80-apache-mariadb105/compose.yml +++ b/docker/dev/mtt-php80-apache-mariadb105/compose.yml @@ -9,7 +9,7 @@ services: build: context: ../mtt-php80-apache/ dockerfile: Dockerfile-web - image: mytinytodo-dev:php8.0-apache + image: mtt-dev/php:8.0-apache container_name: ${PLATFORM_NAME}-web ports: - "8080:80" @@ -30,10 +30,7 @@ services: - network db: - build: - context: ../_mariadb105 - dockerfile: Dockerfile-db - image: mytinytodo-dev:mariadb10.5 + image: mariadb:10.5 container_name: ${PLATFORM_NAME}-db #restart: always environment: @@ -42,6 +39,7 @@ services: MARIADB_PASSWORD: mtt MARIADB_DATABASE: mytinytodo volumes: + - ../_mariadb105/my.cnf:/etc/mysql/conf.d/my.cnf - ../_mariadb105/db_data:/var/lib/mysql networks: - network diff --git a/docker/dev/mtt-php80-apache/compose.yml b/docker/dev/mtt-php80-apache/compose.yml index d14113a..b0a0664 100644 --- a/docker/dev/mtt-php80-apache/compose.yml +++ b/docker/dev/mtt-php80-apache/compose.yml @@ -5,7 +5,7 @@ services: build: context: . dockerfile: Dockerfile-web - image: mytinytodo-dev:php8.0-apache + image: mtt-dev/php:8.0-apache container_name: ${PLATFORM_NAME}-web ports: - "8080:80" diff --git a/docker/dev/mtt-php81-apache-mariadb108/compose.yml b/docker/dev/mtt-php81-apache-mariadb108/compose.yml index a18dcdc..788e3cc 100644 --- a/docker/dev/mtt-php81-apache-mariadb108/compose.yml +++ b/docker/dev/mtt-php81-apache-mariadb108/compose.yml @@ -9,7 +9,7 @@ services: build: context: ../mtt-php81-apache/ dockerfile: Dockerfile-web - image: mytinytodo-dev:php8.1-apache + image: mtt-dev/php:8.1-apache container_name: ${PLATFORM_NAME}-web ports: - "8080:80" @@ -31,25 +31,25 @@ services: - network db: - build: - context: ../_mariadb108 - dockerfile: Dockerfile-db - image: mytinytodo-dev:mariadb10.8 + image: mariadb:10.8 container_name: ${PLATFORM_NAME}-db - restart: always + #restart: always environment: MARIADB_ROOT_PASSWORD: JustForDev MARIADB_USER: mtt MARIADB_PASSWORD: mtt MARIADB_DATABASE: mytinytodo volumes: + - ../_mariadb108/my.cnf:/etc/mysql/conf.d/my.cnf - ../_mariadb108/db_data:/var/lib/mysql networks: - network adminer: - image: adminer + image: adminer:latest container_name: ${PLATFORM_NAME}-adminer + environment: + ADMINER_DEFAULT_SERVER: db ports: - 8079:8080 networks: diff --git a/docker/dev/mtt-php81-apache/compose.yml b/docker/dev/mtt-php81-apache/compose.yml index df4a170..38011d2 100644 --- a/docker/dev/mtt-php81-apache/compose.yml +++ b/docker/dev/mtt-php81-apache/compose.yml @@ -5,7 +5,7 @@ services: build: context: . dockerfile: Dockerfile-web - image: mytinytodo-dev:php8.1-apache + image: mtt-dev/php:8.1-apache container_name: ${PLATFORM_NAME}-web ports: - "8080:80" diff --git a/docker/dev/mtt-php81-nginx/compose.yml b/docker/dev/mtt-php81-nginx/compose.yml index a841084..7e8e41a 100644 --- a/docker/dev/mtt-php81-nginx/compose.yml +++ b/docker/dev/mtt-php81-nginx/compose.yml @@ -9,7 +9,7 @@ services: build: context: ../_nginx dockerfile: Dockerfile-nginx - image: mytinytodo-dev:nginx + image: mtt-dev/nginx container_name: ${PLATFORM_NAME}-web ports: - "8080:80" @@ -24,7 +24,7 @@ services: build: context: . dockerfile: Dockerfile-fpm - image: mytinytodo-dev:php8.1-fpm + image: mtt-dev/php:8.1-fpm container_name: ${PLATFORM_NAME}-fpm hostname: php-fpm environment: diff --git a/docker/dev/mtt-php82-apache/compose.yml b/docker/dev/mtt-php82-apache/compose.yml index 6d03b54..58da7c9 100644 --- a/docker/dev/mtt-php82-apache/compose.yml +++ b/docker/dev/mtt-php82-apache/compose.yml @@ -5,7 +5,7 @@ services: build: context: . dockerfile: Dockerfile-web - image: mytinytodo-dev:php8.2-apache + image: mtt-dev/php:8.2-apache container_name: ${PLATFORM_NAME}-web ports: - "8080:80"