update makefile rules to use docker run (#7747)

Fixes https://github.com/twentyhq/twenty/issues/7739

FYI @BOHEUS, thanks
This commit is contained in:
Weiko
2024-10-16 14:32:58 +02:00
committed by GitHub
parent e811bae10e
commit 082c614013
2 changed files with 16 additions and 51 deletions

View File

@@ -1,26 +1,12 @@
docker-dev-build:
make -C packages/twenty-docker dev-build
docker-dev-up:
make -C packages/twenty-docker dev-up
docker-dev-start:
make -C packages/twenty-docker dev-start
docker-dev-stop:
make -C packages/twenty-docker dev-stop
docker-dev-sh:
make -C packages/twenty-docker dev-sh
postgres-on-docker: postgres-on-docker:
make -C packages/twenty-postgres provision-on-docker docker run \
--name twenty_postgres \
-e POSTGRES_USER=postgres \
-e POSTGRES_PASSWORD=postgres \
-e POSTGRES_DB=default \
-v twenty_db_data:/var/lib/postgresql/data \
-p 5432:5432 \
twentycrm/twenty-postgres:latest
postgres-on-macos-arm: redis-on-docker:
make -C packages/twenty-postgres provision-on-macos-arm docker run -d --name twenty_redis -p 6379:6379 redis/redis-stack-server:latest
postgres-on-macos-intel:
make -C packages/twenty-postgres provision-on-macos-intel
postgres-on-linux:
make -C packages/twenty-postgres provision-on-linux

View File

@@ -105,14 +105,7 @@ You can access the database at [localhost:5432](localhost:5432), with user `twen
<b>Option 2:</b> If you have docker installed: <b>Option 2:</b> If you have docker installed:
```bash ```bash
docker run \ make postgres-on-docker
--name twenty_postgres \
-e POSTGRES_USER=postgres \
-e POSTGRES_PASSWORD=postgres \
-e POSTGRES_DB=default \
-v twenty_db_data:/var/lib/postgresql/data \
-p 5432:5432 \
twentycrm/twenty-postgres:latest
``` ```
</ArticleTab> </ArticleTab>
<ArticleTab> <ArticleTab>
@@ -126,14 +119,7 @@ You can access the database at [localhost:5432](localhost:5432), with user `twen
<b>Option 2:</b> If you have docker installed: <b>Option 2:</b> If you have docker installed:
```bash ```bash
docker run \ make postgres-on-docker
--name twenty_postgres \
-e POSTGRES_USER=postgres \
-e POSTGRES_PASSWORD=postgres \
-e POSTGRES_DB=default \
-v twenty_db_data:/var/lib/postgresql/data \
-p 5432:5432 \
twentycrm/twenty-postgres:latest
``` ```
</ArticleTab> </ArticleTab>
<ArticleTab> <ArticleTab>
@@ -149,14 +135,7 @@ You can access the database at [localhost:5432](localhost:5432), with user `twen
Running Docker on WSL adds an extra layer of complexity. Running Docker on WSL adds an extra layer of complexity.
Only use this option if you are comfortable with the extra steps involved, including turning on [Docker Desktop WSL2](https://docs.docker.com/desktop/wsl). Only use this option if you are comfortable with the extra steps involved, including turning on [Docker Desktop WSL2](https://docs.docker.com/desktop/wsl).
```bash ```bash
docker run \ make postgres-on-docker
--name twenty_postgres \
-e POSTGRES_USER=postgres \
-e POSTGRES_PASSWORD=postgres \
-e POSTGRES_DB=default \
-v twenty_db_data:/var/lib/postgresql/data \
-p 5432:5432 \
twentycrm/twenty-postgres:latest
``` ```
</ArticleTab> </ArticleTab>
</ArticleTabs> </ArticleTabs>
@@ -171,7 +150,7 @@ Twenty requires a redis cache to provide the best performances
<b>Option 2:</b> If you have docker installed: <b>Option 2:</b> If you have docker installed:
```bash ```bash
docker run -d --name my-redis-stack -p 6379:6379 redis/redis-stack-server:latest make redis-on-docker
``` ```
</ArticleTab> </ArticleTab>
<ArticleTab> <ArticleTab>
@@ -182,7 +161,7 @@ Twenty requires a redis cache to provide the best performances
<b>Option 2:</b> If you have docker installed: <b>Option 2:</b> If you have docker installed:
```bash ```bash
docker run -d --name my-redis-stack -p 6379:6379 redis/redis-stack-server:latest make redis-on-docker
``` ```
</ArticleTab> </ArticleTab>
<ArticleTab> <ArticleTab>
@@ -191,7 +170,7 @@ Twenty requires a redis cache to provide the best performances
<b>Option 2:</b> If you have docker installed: <b>Option 2:</b> If you have docker installed:
```bash ```bash
docker run -d --name my-redis-stack -p 6379:6379 redis/redis-stack-server:latest make redis-on-docker
``` ```
</ArticleTab> </ArticleTab>
</ArticleTabs> </ArticleTabs>