mirror of
https://github.com/maxpozdeev/mytinytodo.git
synced 2026-03-11 08:55:27 +00:00
update dev docker files; use mariadb 10.8 with php 8.1
This commit is contained in:
parent
ffa6bc0740
commit
ed31e2eaff
12 changed files with 33 additions and 16 deletions
3
docker/dev/_mariadb108/Dockerfile-db
Normal file
3
docker/dev/_mariadb108/Dockerfile-db
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
FROM mariadb:10.8
|
||||
|
||||
COPY my.cnf /etc/mysql/conf.d/
|
||||
4
docker/dev/_mariadb108/my.cnf
Normal file
4
docker/dev/_mariadb108/my.cnf
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
[mysqld]
|
||||
collation-server = utf8mb4_unicode_ci
|
||||
character-set-server = utf8mb4
|
||||
innodb_log_file_size=10M
|
||||
|
|
@ -2,7 +2,8 @@ FROM php:7.2-apache
|
|||
|
||||
RUN docker-php-ext-install mysqli && \
|
||||
mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
|
||||
mkdir /var/www/phpinfo
|
||||
mkdir /var/www/phpinfo && \
|
||||
a2enmod rewrite
|
||||
|
||||
#COPY php-mtt.ini /usr/local/etc/php/conf.d/
|
||||
#COPY php-opcache.ini /usr/local/etc/php/conf.d/
|
||||
|
|
|
|||
1
docker/dev/mtt-php74-apache/.env
Normal file
1
docker/dev/mtt-php74-apache/.env
Normal file
|
|
@ -0,0 +1 @@
|
|||
PLATFORM_NAME=mtt-dev-php74-apache
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
|
||||
FROM php:7.4-apache
|
||||
|
||||
RUN docker-php-ext-install mysqli && \
|
||||
mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
|
||||
11
docker/dev/mtt-php74-apache/Dockerfile-web
Normal file
11
docker/dev/mtt-php74-apache/Dockerfile-web
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
FROM php:7.4-apache
|
||||
|
||||
RUN docker-php-ext-install mysqli && \
|
||||
mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
|
||||
mkdir /var/www/phpinfo && \
|
||||
a2enmod rewrite
|
||||
|
||||
#COPY php-mtt.ini /usr/local/etc/php/conf.d/
|
||||
#COPY php-opcache.ini /usr/local/etc/php/conf.d/
|
||||
COPY phpinfo.conf /etc/apache2/conf-enabled/
|
||||
COPY phpinfo.php /var/www/phpinfo/
|
||||
|
|
@ -1,8 +1,10 @@
|
|||
services:
|
||||
web:
|
||||
build: ./
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile-web
|
||||
image: mytinytodo-dev:php7.4-apache
|
||||
container_name: mtt-dev-php74-apache
|
||||
container_name: ${PLATFORM_NAME}-web
|
||||
ports:
|
||||
- "8080:80"
|
||||
environment:
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
|
||||
FROM php:8.0-apache
|
||||
|
||||
RUN docker-php-ext-install mysqli && \
|
||||
mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
|
||||
mkdir /var/www/phpinfo
|
||||
mkdir /var/www/phpinfo && \
|
||||
a2enmod rewrite
|
||||
|
||||
COPY php-mtt.ini /usr/local/etc/php/conf.d/
|
||||
COPY php-opcache.ini /usr/local/etc/php/conf.d/
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
PLATFORM_NAME=mtt-dev-php81-apache-mariadb105
|
||||
1
docker/dev/mtt-php81-apache-mariadb108/.env
Normal file
1
docker/dev/mtt-php81-apache-mariadb108/.env
Normal file
|
|
@ -0,0 +1 @@
|
|||
PLATFORM_NAME=mtt-dev-php81-apache-mariadb108
|
||||
|
|
@ -31,9 +31,9 @@ services:
|
|||
|
||||
db:
|
||||
build:
|
||||
context: ../_mariadb105
|
||||
context: ../_mariadb108
|
||||
dockerfile: Dockerfile-db
|
||||
image: mytinytodo-dev:mariadb10.5
|
||||
image: mytinytodo-dev:mariadb10.8
|
||||
container_name: ${PLATFORM_NAME}-db
|
||||
#restart: always
|
||||
environment:
|
||||
|
|
@ -42,6 +42,6 @@ services:
|
|||
MARIADB_PASSWORD: mtt
|
||||
MARIADB_DATABASE: mytinytodo
|
||||
volumes:
|
||||
- ../_mariadb105/db_data:/var/lib/mysql
|
||||
- ../_mariadb108/db_data:/var/lib/mysql
|
||||
networks:
|
||||
- network
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
|
||||
FROM php:8.1-apache
|
||||
|
||||
RUN docker-php-ext-install mysqli && \
|
||||
mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
|
||||
mkdir /var/www/phpinfo
|
||||
mkdir /var/www/phpinfo && \
|
||||
a2enmod rewrite
|
||||
|
||||
COPY php-mtt.ini /usr/local/etc/php/conf.d/
|
||||
COPY php-opcache.ini /usr/local/etc/php/conf.d/
|
||||
|
|
|
|||
Loading…
Reference in a new issue