Simplify docs and remove Docker local setup (#4783)

Having 2 different dev setups caused confusion, let's remove the Docker
local setup and recommend people install yarn locally.

Also simplified some docs by merging pages together, the recommend
self-hosting option is now the docker-compose / to adapt the
docker-compose.
This commit is contained in:
Félix Malfait
2024-04-03 16:38:28 +02:00
committed by GitHub
parent 1c6f0eb577
commit 7a34dc4910
24 changed files with 41 additions and 265 deletions

View File

@ -24,37 +24,37 @@ dev-postgres-build:
@docker compose -f dev/docker-compose.yml up --build postgres -d
prod-docs-build:
@cd ../.. && docker build -f ./packages/twenty-docker/prod/twenty-docs/Dockerfile --tag twenty-docs . && cd -
@cd ../.. && docker build -f ./packages/twenty-docker/twenty-docs/Dockerfile --tag twenty-docs . && cd -
prod-docs-run:
@docker run -d -p 3000:3000 --name twenty-docs twenty-docs
prod-build:
@cd ../.. && docker build -f ./packages/twenty-docker/prod/twenty/Dockerfile --tag twenty . && cd -
@cd ../.. && docker build -f ./packages/twenty-docker/twenty/Dockerfile --tag twenty . && cd -
prod-run:
@docker run -d -p 3000:3000 --name twenty twenty
prod-front-build:
@cd ../.. && docker build -f ./packages/twenty-docker/prod/twenty-front/Dockerfile --tag twenty-front . && cd -
@cd ../.. && docker build -f ./packages/twenty-docker/twenty-front/Dockerfile --tag twenty-front . && cd -
prod-front-run:
@docker run -d -p 3001:3000 --name twenty-front twenty-front
prod-server-build:
@cd ../.. && docker build -f ./packages/twenty-docker/prod/twenty-server/Dockerfile --tag twenty-server . && cd -
@cd ../.. && docker build -f ./packages/twenty-docker/twenty-server/Dockerfile --tag twenty-server . && cd -
prod-server-run:
@docker run -d -p 3000:3000 --name twenty-server twenty-server
prod-postgres-build:
@cd ../.. && docker build -f ./packages/twenty-docker/prod/twenty-postgres/Dockerfile --tag twenty-postgres . && cd -
@cd ../.. && docker build -f ./packages/twenty-docker/twenty-postgres/Dockerfile --tag twenty-postgres . && cd -
prod-postgres-run:
@docker run -d -p 5432:5432 -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres --name twenty-postgres twenty-postgres
prod-website-build:
@cd ../.. && docker build -f ./packages/twenty-docker/prod/twenty-website/Dockerfile --tag twenty-website . && cd -
@cd ../.. && docker build -f ./packages/twenty-docker/twenty-website/Dockerfile --tag twenty-website . && cd -
prod-website-run:
@docker run -d -p 3000:3000 --name twenty-website twenty-website
@ -64,7 +64,7 @@ release-front:
--push \
--no-cache \
--platform linux/amd64,linux/arm64 \
-f ./packages/twenty-docker/prod/twenty-front/Dockerfile -t twentycrm/twenty-front:$(version) -t twentycrm/twenty-front:latest . \
-f ./packages/twenty-docker/twenty-front/Dockerfile -t twentycrm/twenty-front:$(version) -t twentycrm/twenty-front:latest . \
&& cd -
release-server:
@ -72,7 +72,7 @@ release-server:
--push \
--no-cache \
--platform linux/amd64,linux/arm64 \
-f ./packages/twenty-docker/prod/twenty-server/Dockerfile -t twentycrm/twenty-server:$(version) -t twentycrm/twenty-server:latest . \
-f ./packages/twenty-docker/twenty-server/Dockerfile -t twentycrm/twenty-server:$(version) -t twentycrm/twenty-server:latest . \
&& cd -
release-docs:
@ -80,7 +80,7 @@ release-docs:
--push \
--no-cache \
--platform linux/amd64,linux/arm64 \
-f ./packages/twenty-docker/prod/twenty-docs/Dockerfile -t twentycrm/twenty-docs:$(version) -t twentycrm/twenty-docs:latest . \
-f ./packages/twenty-docker/twenty-docs/Dockerfile -t twentycrm/twenty-docs:$(version) -t twentycrm/twenty-docs:latest . \
&& cd -
release-postgres:
@ -88,5 +88,5 @@ release-postgres:
--push \
--no-cache \
--platform linux/amd64,linux/arm64 \
-f ./packages/twenty-docker/prod/twenty-postgres/Dockerfile -t twentycrm/twenty-postgres:$(version) -t twentycrm/twenty-postgres:latest . \
-f ./packages/twenty-docker/twenty-postgres/Dockerfile -t twentycrm/twenty-postgres:$(version) -t twentycrm/twenty-postgres:latest . \
&& cd -

View File

@ -1,39 +0,0 @@
version: "3.9"
services:
twenty-dev:
build:
context: ../../..
dockerfile: ./packages/twenty-docker/dev/twenty-dev/Dockerfile
ports:
- "3000:3000"
- "3001:3001"
- "6006:6006"
volumes:
- ../../..:/app
- twenty_dev_node_modules_root:/app/node_modules
- twenty_dev_node_modules_docs:/app/packages/twenty-docs/node_modules
- twenty_dev_node_modules_front:/app/packages/twenty-front/node_modules
- twenty_dev_node_modules_server:/app/packages/twenty-server/node_modules
- twenty_dev_node_modules_website:/app/packages/twenty-website/node_modules
depends_on:
- postgres
postgres:
container_name: twenty_postgres
image: twentycrm/twenty-postgres:latest
volumes:
- twenty_db_data:/bitnami/postgresql
environment:
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=postgres
- POSTGRES_DB=default
ports:
- "5432:5432"
volumes:
twenty_db_data:
name: twenty_db_data
twenty_dev_node_modules_root:
twenty_dev_node_modules_docs:
twenty_dev_node_modules_eslint:
twenty_dev_node_modules_front:
twenty_dev_node_modules_server:
twenty_dev_node_modules_website:

View File

@ -1,7 +0,0 @@
FROM node:18.17.1-bullseye as twenty-dev
WORKDIR /app
RUN npx playwright install-deps
CMD ["tail", "-f", "/dev/null"]

View File

@ -26,7 +26,7 @@ FROM node:18.17.1-alpine as twenty-front
WORKDIR /app/packages/twenty-front
COPY --from=twenty-front-build /app/packages/twenty-front/build ./build
COPY ./packages/twenty-docker/prod/twenty-front/serve.json ./build
COPY ./packages/twenty-docker/twenty-front/serve.json ./build
COPY ./packages/twenty-front/scripts/inject-runtime-env.sh /app/packages/twenty-front/scripts/inject-runtime-env.sh
RUN yarn global add serve

View File

@ -47,7 +47,7 @@ WORKDIR mysql_fdw
RUN make USE_PGXS=1
RUN make USE_PGXS=1 install
COPY ./packages/twenty-docker/prod/twenty-postgres/init.sql /docker-entrypoint-initdb.d/
COPY ./packages/twenty-docker/twenty-postgres/init.sql /docker-entrypoint-initdb.d/
USER 1001
ENTRYPOINT ["/opt/bitnami/scripts/postgresql/entrypoint.sh"]

View File

@ -50,7 +50,7 @@ FROM node:18.17.1-alpine as twenty
# Used to run healthcheck in docker
RUN apk add --no-cache curl jq
COPY ./packages/twenty-docker/prod/twenty/entrypoint.sh /app/entrypoint.sh
COPY ./packages/twenty-docker/twenty/entrypoint.sh /app/entrypoint.sh
RUN chmod +x /app/entrypoint.sh
WORKDIR /app/packages/twenty-server