Skip to content
Snippets Groups Projects
Commit ebb9336c authored by CANALS Gerome's avatar CANALS Gerome
Browse files

utf8 as default for mysql/mariadb

parent d9b48ebc
Branches
No related tags found
No related merge requests found
...@@ -28,8 +28,7 @@ services: ...@@ -28,8 +28,7 @@ services:
# - postgres:pg # - postgres:pg
php: php:
image: canals/php7.2-cli image: canals/php7.3-cli
container_name: php.local
expose: expose:
- "8000" - "8000"
ports: ports:
...@@ -53,10 +52,11 @@ services: ...@@ -53,10 +52,11 @@ services:
# image: mysql:5.6 # image: mysql:5.6
image: mariadb:latest image: mariadb:latest
container_name: mysql.dev.local container_name: mysql.dev.local
command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8_general_ci
environment: environment:
- MYSQL_ROOT_PASSWORD=root - MYSQL_ROOT_PASSWORD=secret
- MYSQL_USER=user - MYSQL_USER=user
- MYSQL_PASSWORD=user - MYSQL_PASSWORD=secure
- MYSQL_DATABASE=mydatab - MYSQL_DATABASE=mydatab
networks: networks:
- local_network - local_network
...@@ -67,7 +67,6 @@ services: ...@@ -67,7 +67,6 @@ services:
adminer: adminer:
image: adminer image: adminer
container_name: adminer.dev.local
ports: ports:
- "8080:8080" - "8080:8080"
networks: networks:
...@@ -77,34 +76,13 @@ services: ...@@ -77,34 +76,13 @@ services:
##############################################
# A second php service
##############################################
# api:
# image: canals/php
# container_name: api
## environment:
# - VHOST_HOSTNAME=api.local
# - VHOST_DOCROOT=/var/www/api
# ports:
# - "6080:80"
# - "6443:443"
# volumes :
# - ./api:/var/www/api
# - ./src:/var/www/src
# - ./html:/var/www/html
# networks:
# - local_network
# links :
# - mysql:db
################################## ##################################
# postgres + adminer # postgres + adminer
################################### ###################################
# postgres: # postgres:
# image: postgres # image: postgres
# container_name: postgres.local
# environment : # environment :
# - POSTGRES_PASSWORD = pgroot # - POSTGRES_PASSWORD = pgroot
# - POSTGRES_USER = pguser # - POSTGRES_USER = pguser
...@@ -115,7 +93,6 @@ services: ...@@ -115,7 +93,6 @@ services:
# adminer-pg: # adminer-pg:
# image: adminer # image: adminer
# container_name: adminer_pg.dev.local
# networks: # networks:
# - local_network # - local_network
# ports: # ports:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment