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 #597

Merged
merged 1 commit into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
30 changes: 0 additions & 30 deletions docker/docker-compose.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ services:
# SMTP conf
- ./ssmtp.conf:/etc/ssmtp/ssmtp.conf
# Mercator entry point
- ./entrypoint.sh:/var/www/mercator/docker/entrypoint.sh:ro
# ne peut pas être read-only (commande php artisan key:generate le modifie)
- ./.env:/var/www/mercator/.env
# map la database sqlite sur le disque de l'hôte
- ./data/sql/:/var/www/mercator/sql/
Expand All @@ -22,34 +20,6 @@ services:
- 8000:80
networks:
- local
# Non fonctionnel pour le moment la database utilisé par défaut est interne au conteneur APP
#db:
# image: mysql:5.7
# restart: unless-stopped
# environment:
# MYSQL_DATABASE: ${DB_DATABASE}
# MYSQL_USER: ${DB_USERNAME}
# MYSQL_PASSWORD: ${DB_PASSWORD}
# MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
# # MYSQL_ALLOW_EMPTY_PASSWORD: "true"
# volumes:
# - db:/var/lib/mysql
# - ./data/backup:/backup
# - ./bin/mysql:/app/
# networks:
# - local

# nginx:
# image: nginx:alpine
# container_name: travellist-nginx
# restart: unless-stopped
# ports:
# - 8000:80
# volumes:
# - ./:/var/www
# - ./docker-compose/nginx:/etc/nginx/conf.d/
# networks:
# - local

networks:
local:
Expand Down
15 changes: 0 additions & 15 deletions docker/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,5 @@ cd /var/www/mercator

_wait_for_db_ready

# initialisation de la base de données si elle n'existe pas
if [ ! -s ./sql/db.sqlite ]
then
php artisan --no-interaction migrate --seed

# génération des clés
php artisan key:generate

# vider le cache
php artisan config:clear

# configurer Passport for Mercator API : https://dbarzin.github.io/mercator/api/
php artisan passport:install
fi

# start application
php artisan serve --host=0.0.0.0
Loading