Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:dbarzin/mercator into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
dbarzin committed Dec 3, 2024
2 parents 3671ccb + 0e8cca1 commit 62a5a69
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion INSTALL.fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Installer Apache2, GIT, Graphviz et Composer

Installer PHP et les librairies

sudo apt install php-zip php-curl php-mbstring php-dom php-ldap php-soap php-xdebug php-mysql php-gd libapache2-mod-php
sudo apt install php-zip php-curl php-mbstring php-xml php-ldap php-soap php-xdebug php-mysql php-gd libapache2-mod-php

## Project

Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Update the linux distribution

Install PHP and some PHP libraries

sudo apt install php-zip php-curl php-mbstring php-dom php-ldap php-soap php-xdebug php-mysql php-gd libapache2-mod-php
sudo apt install php-zip php-curl php-mbstring php-xml php-ldap php-soap php-xdebug php-mysql php-gd libapache2-mod-php

Install Apache2, GIT, Graphviz et Composer

Expand Down
6 changes: 3 additions & 3 deletions README.fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,21 @@ Pour des instructions détaillées, veuillez vous référer aux guides d'install
Démarrez rapidement avec Docker. Exécutez une instance locale en mode développement :

```bash
docker run -it --rm -e USE_DEMO_DATA=1 -p 8000:80 ghcr.io/dbarzin/mercator:latest
docker run -it --rm -e USE_DEMO_DATA=1 -p 8000:8080 ghcr.io/dbarzin/mercator:latest
```
Pour rendre vos données persistantes avec SQLite :

```bash
touch ./db.sqlite && chmod a+w ./db.sqlite
docker run -it --rm -e APP_ENV=development -p 8000:80 -v $PWD/db.sqlite:/var/www/mercator/sql/db.sqlite ghcr.io/dbarzin/mercator:latest
docker run -it --rm -e APP_ENV=development -p 8000:8080 -v $PWD/db.sqlite:/var/www/mercator/sql/db.sqlite ghcr.io/dbarzin/mercator:latest
```

Populez la base de données avec des données de démonstration :

```bash
docker run -it --rm \
-e APP_ENV=development \
-p 8000:80 \
-p 8000:8080 \
-v $PWD/db.sqlite:/var/www/mercator/sql/db.sqlite \
-e USE_DEMO_DATA=1 \
ghcr.io/dbarzin/mercator:latest
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,22 @@ For detailed instructions, please refer to the installation guides:
Get up and running quickly using Docker. Run a local instance in development mode:

```bash
docker run -it --rm -e USE_DEMO_DATA=1 -p 8000:80 ghcr.io/dbarzin/mercator:latest
docker run -it --rm -e USE_DEMO_DATA=1 -p 8000:8080 ghcr.io/dbarzin/mercator:latest
```

To persist your data using SQLite:

```bash
touch ./db.sqlite && chmod a+w ./db.sqlite
docker run -it --rm -e APP_ENV=development -p 8000:80 -v $PWD/db.sqlite:/var/www/mercator/sql/db.sqlite ghcr.io/dbarzin/mercator:latest
docker run -it --rm -e APP_ENV=development -p 8000:8080 -v $PWD/db.sqlite:/var/www/mercator/sql/db.sqlite ghcr.io/dbarzin/mercator:latest
```

Populate the database with demo data:

```bash
docker run -it --rm \
-e APP_ENV=development \
-p 8000:80 \
-p 8000:8080 \
-v $PWD/db.sqlite:/var/www/mercator/sql/db.sqlite \
-e USE_DEMO_DATA=1 \
ghcr.io/dbarzin/mercator:latest
Expand Down

0 comments on commit 62a5a69

Please sign in to comment.