Skip to content

Commit 6ab7a40

Browse files
authored
🚚 Rename Docker Compose files to new names, compose.yml (#2106)
1 parent 03bca13 commit 6ab7a40

File tree

13 files changed

+21
-21
lines changed

13 files changed

+21
-21
lines changed

.github/workflows/deploy-production.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ jobs:
2828
steps:
2929
- name: Checkout
3030
uses: actions/checkout@v6
31-
- run: docker compose -f docker-compose.yml --project-name ${{ secrets.STACK_NAME_PRODUCTION }} build
32-
- run: docker compose -f docker-compose.yml --project-name ${{ secrets.STACK_NAME_PRODUCTION }} up -d
31+
- run: docker compose -f compose.yml --project-name ${{ secrets.STACK_NAME_PRODUCTION }} build
32+
- run: docker compose -f compose.yml --project-name ${{ secrets.STACK_NAME_PRODUCTION }} up -d

.github/workflows/deploy-staging.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ jobs:
2828
steps:
2929
- name: Checkout
3030
uses: actions/checkout@v6
31-
- run: docker compose -f docker-compose.yml --project-name ${{ secrets.STACK_NAME_STAGING }} build
32-
- run: docker compose -f docker-compose.yml --project-name ${{ secrets.STACK_NAME_STAGING }} up -d
31+
- run: docker compose -f compose.yml --project-name ${{ secrets.STACK_NAME_STAGING }} build
32+
- run: docker compose -f compose.yml --project-name ${{ secrets.STACK_NAME_STAGING }} up -d

.github/workflows/playwright.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- backend/**
3333
- frontend/**
3434
- .env
35-
- docker-compose*.yml
35+
- compose*.yml
3636
- .github/workflows/playwright.yml
3737
3838
test-playwright:

backend/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ The setup is also already configured so you can run the tests through the VS Cod
3737

3838
## Docker Compose Override
3939

40-
During development, you can change Docker Compose settings that will only affect the local development environment in the file `docker-compose.override.yml`.
40+
During development, you can change Docker Compose settings that will only affect the local development environment in the file `compose.override.yml`.
4141

4242
The changes to that file only affect the local development environment, not the production environment. So, you can add "temporary" changes that help the development workflow.
4343

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
ports:
1313
- "80:80"
1414
- "8090:8080"
15-
# Duplicate the command from docker-compose.yml to add --api.insecure=true
15+
# Duplicate the command from compose.yml to add --api.insecure=true
1616
command:
1717
# Enable Docker in Traefik, so that it reads labels from Docker services
1818
- --providers.docker
File renamed without changes.

deployment.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ mkdir -p /root/code/traefik-public/
3232
Copy the Traefik Docker Compose file to your server. You could do it by running the command `rsync` in your local terminal:
3333

3434
```bash
35-
rsync -a docker-compose.traefik.yml root@your-server.example.com:/root/code/traefik-public/
35+
rsync -a compose.traefik.yml root@your-server.example.com:/root/code/traefik-public/
3636
```
3737

3838
### Traefik Public Network
@@ -97,10 +97,10 @@ Go to the directory where you copied the Traefik Docker Compose file in your rem
9797
cd /root/code/traefik-public/
9898
```
9999

100-
Now with the environment variables set and the `docker-compose.traefik.yml` in place, you can start the Traefik Docker Compose running the following command:
100+
Now with the environment variables set and the `compose.traefik.yml` in place, you can start the Traefik Docker Compose running the following command:
101101

102102
```bash
103-
docker compose -f docker-compose.traefik.yml up -d
103+
docker compose -f compose.traefik.yml up -d
104104
```
105105

106106
## Deploy the FastAPI Project
@@ -168,10 +168,10 @@ Copy the content and use that as password / secret key. And run that again to ge
168168
With the environment variables in place, you can deploy with Docker Compose:
169169

170170
```bash
171-
docker compose -f docker-compose.yml up -d
171+
docker compose -f compose.yml up -d
172172
```
173173

174-
For production you wouldn't want to have the overrides in `docker-compose.override.yml`, that's why we explicitly specify `docker-compose.yml` as the file to use.
174+
For production you wouldn't want to have the overrides in `compose.override.yml`, that's why we explicitly specify `compose.yml` as the file to use.
175175

176176
## Continuous Deployment (CD)
177177

development.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,13 @@ After you update it, run again:
105105
docker compose watch
106106
```
107107

108-
When deploying, for example in production, the main Traefik is configured outside of the Docker Compose files. For local development, there's an included Traefik in `docker-compose.override.yml`, just to let you test that the domains work as expected, for example with `api.localhost.tiangolo.com` and `dashboard.localhost.tiangolo.com`.
108+
When deploying, for example in production, the main Traefik is configured outside of the Docker Compose files. For local development, there's an included Traefik in `compose.override.yml`, just to let you test that the domains work as expected, for example with `api.localhost.tiangolo.com` and `dashboard.localhost.tiangolo.com`.
109109

110110
## Docker Compose files and env vars
111111

112-
There is a main `docker-compose.yml` file with all the configurations that apply to the whole stack, it is used automatically by `docker compose`.
112+
There is a main `compose.yml` file with all the configurations that apply to the whole stack, it is used automatically by `docker compose`.
113113

114-
And there's also a `docker-compose.override.yml` with overrides for development, for example to mount the source code as a volume. It is used automatically by `docker compose` to apply overrides on top of `docker-compose.yml`.
114+
And there's also a `compose.override.yml` with overrides for development, for example to mount the source code as a volume. It is used automatically by `docker compose` to apply overrides on top of `compose.yml`.
115115

116116
These Docker Compose files use the `.env` file containing configurations to be injected as environment variables in the containers.
117117

@@ -129,7 +129,7 @@ The `.env` file is the one that contains all your configurations, generated keys
129129

130130
Depending on your workflow, you could want to exclude it from Git, for example if your project is public. In that case, you would have to make sure to set up a way for your CI tools to obtain it while building or deploying your project.
131131

132-
One way to do it could be to add each environment variable to your CI/CD system, and updating the `docker-compose.yml` file to read that specific env var instead of reading the `.env` file.
132+
One way to do it could be to add each environment variable to your CI/CD system, and updating the `compose.yml` file to read that specific env var instead of reading the `.env` file.
133133

134134
## Pre-commits and code linting
135135

frontend/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ If you are developing an API-only app and want to remove the frontend, you can d
2525

2626
* Remove the `./frontend` directory.
2727

28-
* In the `docker-compose.yml` file, remove the whole service / section `frontend`.
28+
* In the `compose.yml` file, remove the whole service / section `frontend`.
2929

30-
* In the `docker-compose.override.yml` file, remove the whole service / section `frontend` and `playwright`.
30+
* In the `compose.override.yml` file, remove the whole service / section `frontend` and `playwright`.
3131

3232
Done, you have a frontend-less (api-only) app. 🤓
3333

0 commit comments

Comments
 (0)