Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix docker installation #401

Draft
wants to merge 4 commits into
base: cesar/migrateToPhp8
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions .env.docker.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
APP_NAME="Portail des Assos"
APP_ENV=develop
APP_KEY=
APP_DEBUG=true
APP_URL=http://localhost:8000
APP_ASSO=simde

LOG_CHANNEL=stack

DB_CONNECTION=mysql
DB_HOST=database
DB_PORT=3306
DB_DATABASE=portail
DB_USERNAME=portail
DB_PASSWORD=portail
Comment on lines +10 to +15
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pourquoi ? C'est des valeurs fixes car uniquement utilisées pour du dev local, pas besoin de les modifier. Elles devraient rester en dur dans le docker-compose

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Je crois que c'est un paramètre qu'il faut préciser à la fois sous cette forme pour le portail…

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Je peux mettre celui-ci dans docker-compose aussi stu veux


BROADCAST_DRIVER=log
CACHE_DRIVER=file
SESSION_DRIVER=file
SESSION_LIFETIME=120
QUEUE_CONNECTION=database

PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=mt1

MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

# Fill this to add you as localy as administrator
ADMIN_EMAIL=
ADMIN_FIRSTNAME=
ADMIN_LASTNAME=

# CAS_URL=https://cas.utc.fr/cas/
# CAS_IMAGE=https://dem_utilal30/portal30.get_photo_utilisateur?username=

# GINGER_KEY=fauxginger
# GINGER_URL=http://fauxginger:9090/index.php/v1/
2 changes: 2 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@
"doctrine/dbal": "^2.6",
"encore/laravel-admin": "^1.7",
"fideloper/proxy": "~4.0",
"gmostafa/php-graphql-client": "^1.13",
"grimzy/laravel-mysql-spatial": "^2.1",
"ixudra/curl": "^6.16",
"laravel-admin-ext/chartjs": "^1.0",
"laravel-admin-ext/log-viewer": "^1.0",
"laravel/framework": "5.8.*",
"laravel/passport": "7.*",
"laravel/tinker": "~1.0",
"lcobucci/jwt": "3.3.3",
"mews/captcha": "^2.2",
"nastuzzi-samy/api-tester": "^1.1",
"nastuzzi-samy/laravel-model-stages": "^1.0",
Expand Down
6 changes: 2 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
version: '3.7'

volumes:
dbdata:

services:

# The Back-End Application (Laravel)
Expand Down Expand Up @@ -52,9 +49,10 @@ services:
database:
image: mysql
volumes:
- dbdata:/var/lib/mysql
- ./storage/database/mysql:/var/lib/mysql
ppom0 marked this conversation as resolved.
Show resolved Hide resolved
environment:
- MYSQL_ROOT_PASSWORD=portail
- MYSQL_USER=portail
- MYSQL_PASSWORD=portail
- MYSQL_DATABASE=portail
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CF les ENV plus haut, en plus ca n'a pas l'air utilisé, si ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

… et sous celui-ci pour mysql.

command: --default-authentication-plugin=mysql_native_password
2 changes: 2 additions & 0 deletions documentation/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ The following 3 commands will download the project, move to the new folder and i
```bash
git clone https://github.com/simde-utc/portail.git # ssh version : git clone [email protected]:simde-utc/portail.git
cd portail
cp .env.docker.example .env # and edit .env.docker.example
chmod -R 777 storage # this command may be required to run again as root to fix permissions issues
docker/run # or "docker/run -d" to run in background
```

Expand Down
Loading