Skip to content

Commit 3191d89

Browse files
committed
♻️(docker) rename frontend-dev service in frontend
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.
1 parent 68f3387 commit 3191d89

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ build-yjs-provider: ## build the y-provider container
108108

109109
build-frontend: cache ?=
110110
build-frontend: ## build the frontend container
111-
@$(COMPOSE) build frontend-dev $(cache)
111+
@$(COMPOSE) build frontend $(cache)
112112
.PHONY: build-frontend
113113

114114
down: ## stop and remove containers, networks, images, and volumes
@@ -128,7 +128,7 @@ run-backend: ## Start only the backend application and all needed services
128128
run: ## start the wsgi (production) and development server
129129
run:
130130
@$(MAKE) run-backend
131-
@$(COMPOSE) up --force-recreate -d frontend-dev
131+
@$(COMPOSE) up --force-recreate -d frontend
132132
.PHONY: run
133133

134134
status: ## an alias for "docker compose ps"
@@ -306,16 +306,16 @@ help:
306306
.PHONY: help
307307

308308
# Front
309-
frontend-install: ## install the frontend locally
309+
frontend-development-install: ## install the frontend locally
310310
cd $(PATH_FRONT_IMPRESS) && yarn
311-
.PHONY: frontend-install
311+
.PHONY: frontend-development-install
312312

313313
frontend-lint: ## run the frontend linter
314314
cd $(PATH_FRONT) && yarn lint
315315
.PHONY: frontend-lint
316316

317317
run-frontend-development: ## Run the frontend in development mode
318-
@$(COMPOSE) stop frontend-dev
318+
@$(COMPOSE) stop frontend
319319
cd $(PATH_FRONT_IMPRESS) && yarn dev
320320
.PHONY: run-frontend-development
321321

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ $ docker -v
6666
6767
Docker version 20.10.2, build 2291f61
6868
69-
$ docker compose -v
69+
$ docker compose version
7070
71-
docker compose version 1.27.4, build 40524192
71+
Docker Compose version v2.32.4
7272
```
7373

7474
> ⚠️ You may need to run the following commands with sudo but this can be avoided by adding your user to the `docker` group.
@@ -97,15 +97,15 @@ password: impress
9797
📝 Note that if you need to run them afterwards, you can use the eponym Make rule:
9898

9999
```shellscript
100-
$ make run-with-frontend
100+
$ make run
101101
```
102102

103103
⚠️ For the frontend developer, it is often better to run the frontend in development mode locally.
104104

105105
To do so, install the frontend dependencies with the following command:
106106

107107
```shellscript
108-
$ make frontend-install
108+
$ make frontend-development-install
109109
```
110110

111111
And run the frontend locally in development mode with the following command:
@@ -117,7 +117,7 @@ $ make run-frontend-development
117117
To start all the services, except the frontend container, you can use the following command:
118118

119119
```shellscript
120-
$ make run
120+
$ make run-backend
121121
```
122122

123123
**Adding content**

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ services:
145145
condition: service_healthy
146146
restart: true
147147

148-
frontend-dev:
148+
frontend:
149149
user: "${DOCKER_USER:-1000}"
150150
build:
151151
context: .

0 commit comments

Comments
 (0)