Skip to content

Commit aa3a5bf

Browse files
JPechbertyJPechberty
JPechberty
authored and
JPechberty
committed
config docker-compose, gitignore et env
1 parent 42dcc6a commit aa3a5bf

File tree

4 files changed

+31
-33
lines changed

4 files changed

+31
-33
lines changed

Diff for: .gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
1+
/.idea
22
###> symfony/framework-bundle ###
3+
.env
4+
/.env
35
/.env.local
46
/.env.local.php
57
/.env.*.local

Diff for: .env renamed to _.env.example

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ APP_SECRET=13fef4bd93bb5c6371d92481e7b39b10
2525
#
2626
# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
2727
# DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=8.0.32&charset=utf8mb4"
28-
# DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
29-
DATABASE_URL="postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
28+
DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
29+
# DATABASE_URL="postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
3030
###< doctrine/doctrine-bundle ###
3131

3232
###> symfony/messenger ###
@@ -39,3 +39,4 @@ MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
3939
###> symfony/mailer ###
4040
# MAILER_DSN=null://null
4141
###< symfony/mailer ###
42+
APP_NAME=sf-secure-entities

Diff for: docker-compose.override.yml

-14
This file was deleted.

Diff for: docker-compose.yml

+25-16
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
1-
version: '3'
2-
1+
version: "3.8"
32
services:
4-
###> doctrine/doctrine-bundle ###
53
database:
6-
image: postgres:${POSTGRES_VERSION:-15}-alpine
4+
container_name: ${APP_NAME}-database
5+
image: mariadb:10.5.8
6+
ports:
7+
- "3306:3306"
8+
restart: always
79
environment:
8-
POSTGRES_DB: ${POSTGRES_DB:-app}
9-
# You should definitely change the password in production
10-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-!ChangeMe!}
11-
POSTGRES_USER: ${POSTGRES_USER:-app}
10+
MYSQL_DATABASE: app_db
11+
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
1212
volumes:
13-
- database_data:/var/lib/postgresql/data:rw
14-
# You may use a bind-mounted host directory instead, so that it is harder to accidentally remove the volume and lose all your data!
15-
# - ./docker/db/data:/var/lib/postgresql/data:rw
16-
###< doctrine/doctrine-bundle ###
17-
13+
- ./var/dbdata:/var/lib/mysql
14+
phpmyadmin:
15+
container_name: ${APP_NAME}-pma
16+
image: phpmyadmin/phpmyadmin
17+
ports:
18+
- "8081:80"
19+
environment:
20+
PMA_HOST: database
21+
PMA_PORT: 3306
22+
PMA_ARBITRARY: 1
23+
UPLOAD_LIMIT: 1G
24+
MEMORY_LIMIT: 512M
25+
MAX_EXECUTION_TIME: 0
26+
restart: always
27+
links:
28+
- database
1829
volumes:
19-
###> doctrine/doctrine-bundle ###
20-
database_data:
21-
###< doctrine/doctrine-bundle ###
30+
dbdata:

0 commit comments

Comments
 (0)