studio/docs
Archived
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

♻️(docker) rename frontend-dev service in frontend

Browse Source 
The frontend-dev service is in fact using the production image. We
rename it in frontend accordingly with what it really does. We also have
to change name rules in Makefile to be consistent.
This commit is contained in:
Manuel Raynaud
2025-02-14 13:10:35 +01:00
parent 68f3387539
commit 3191d890f3
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -108,7 +108,7 @@ build-yjs-provider: ## build the y-provider container
build-frontend: cache ?= build-frontend: cache ?=
build-frontend: ## build the frontend container build-frontend: ## build the frontend container
@$(COMPOSE) build frontend-dev $(cache) @$(COMPOSE) build frontend $(cache)
.PHONY: build-frontend .PHONY: build-frontend
down: ## stop and remove containers, networks, images, and volumes down: ## stop and remove containers, networks, images, and volumes
@@ -128,7 +128,7 @@ run-backend: ## Start only the backend application and all needed services
run: ## start the wsgi (production) and development server run: ## start the wsgi (production) and development server
run: run:
@$(MAKE) run-backend @$(MAKE) run-backend
@$(COMPOSE) up --force-recreate -d frontend-dev @$(COMPOSE) up --force-recreate -d frontend
.PHONY: run .PHONY: run
status: ## an alias for "docker compose ps" status: ## an alias for "docker compose ps"
@@ -306,16 +306,16 @@ help:
.PHONY: help .PHONY: help
# Front # Front
frontend-install: ## install the frontend locally frontend-development-install: ## install the frontend locally
cd $(PATH_FRONT_IMPRESS) && yarn cd $(PATH_FRONT_IMPRESS) && yarn
.PHONY: frontend-install .PHONY: frontend-development-install
frontend-lint: ## run the frontend linter frontend-lint: ## run the frontend linter
cd $(PATH_FRONT) && yarn lint cd $(PATH_FRONT) && yarn lint
.PHONY: frontend-lint .PHONY: frontend-lint
run-frontend-development: ## Run the frontend in development mode run-frontend-development: ## Run the frontend in development mode
@$(COMPOSE) stop frontend-dev @$(COMPOSE) stop frontend
cd $(PATH_FRONT_IMPRESS) && yarn dev cd $(PATH_FRONT_IMPRESS) && yarn dev
.PHONY: run-frontend-development .PHONY: run-frontend-development

10
README.md
View File

@@ -66,9 +66,9 @@ $ docker -v
Docker version 20.10.2, build 2291f61 Docker version 20.10.2, build 2291f61
$ docker compose -v $ docker compose version
docker compose version 1.27.4, build 40524192 Docker Compose version v2.32.4
``` ```
> ⚠️ You may need to run the following commands with sudo but this can be avoided by adding your user to the `docker` group. > ⚠️ You may need to run the following commands with sudo but this can be avoided by adding your user to the `docker` group.
@@ -97,7 +97,7 @@ password: impress
📝 Note that if you need to run them afterwards, you can use the eponym Make rule: 📝 Note that if you need to run them afterwards, you can use the eponym Make rule:
```shellscript ```shellscript
$ make run-with-frontend $ make run
``` ```
⚠️ For the frontend developer, it is often better to run the frontend in development mode locally. ⚠️ For the frontend developer, it is often better to run the frontend in development mode locally.
@@ -105,7 +105,7 @@ $ make run-with-frontend
To do so, install the frontend dependencies with the following command: To do so, install the frontend dependencies with the following command:
```shellscript ```shellscript
$ make frontend-install $ make frontend-development-install
``` ```
And run the frontend locally in development mode with the following command: And run the frontend locally in development mode with the following command:
@@ -117,7 +117,7 @@ $ make run-frontend-development
To start all the services, except the frontend container, you can use the following command: To start all the services, except the frontend container, you can use the following command:
```shellscript ```shellscript
$ make run $ make run-backend
``` ```
**Adding content** **Adding content**

2
docker-compose.yml
View File

@@ -145,7 +145,7 @@ services:
condition: service_healthy condition: service_healthy
restart: true restart: true
frontend-dev: frontend:
user: "${DOCKER_USER:-1000}" user: "${DOCKER_USER:-1000}"
build: build:
context: . context: .