Skip to content

Commit 7c01656

Browse files
committed
chore(docker): update docker-compose commands
TH-1422. Change all `docker-compose` commands to `docker compose`.
1 parent 7306a13 commit 7c01656

18 files changed

Lines changed: 75 additions & 75 deletions

File tree

apps/events-helsinki/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Run the development server:
8787
```
8888
yarn dev
8989
# or
90-
docker-compose up
90+
docker compose up
9191
```
9292

9393
Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

apps/events-helsinki/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
"check-size": "size-limit --highlight-less",
1515
"clean": "rimraf --no-glob ./.next ./out ./coverage ./tsconfig.tsbuildinfo",
1616
"dev": "next dev",
17-
"docker:build": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.yml build --progress=tty runner",
18-
"docker:develop": "cross-env DOCKER_BUILDKIT=1 docker-compose -f ./docker-compose.yml up",
19-
"docker:develop:reinstall": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.yml build --progress=tty --no-cache --force-rm develop",
17+
"docker:build": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.yml build --progress=tty runner",
18+
"docker:develop": "cross-env DOCKER_BUILDKIT=1 docker compose -f ./docker-compose.yml up",
19+
"docker:develop:reinstall": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.yml build --progress=tty --no-cache --force-rm develop",
2020
"docker:install": "docker buildx bake -f docker-compose.events.yml --progress=tty deps",
2121
"docker:prune-cache": "docker buildx prune",
22-
"docker:serve": "docker-compose -f docker-compose.yml --env-file .env up runner",
22+
"docker:serve": "docker compose -f docker-compose.yml --env-file .env up runner",
2323
"generate:graphql": "DOTENV_CONFIG_PATH=./.env.local graphql-codegen -r dotenv/config --config ../../packages/components/codegen.ts",
2424
"get-translations": "node ./scripts/get-translations.js",
2525
"lint": "eslint . --ext .ts,.tsx,.js,.jsx,.cjs,.mjs,.mdx,.graphql --cache --cache-location ../../.cache/eslint/events-helsinki.eslintcache",

apps/hobbies-helsinki/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Run the development server:
8787
```
8888
yarn dev
8989
# or
90-
docker-compose up
90+
docker compose up
9191
```
9292

9393
Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

apps/hobbies-helsinki/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
"check-size": "size-limit --highlight-less",
1515
"clean": "rimraf --no-glob ./.next ./out ./coverage ./tsconfig.tsbuildinfo",
1616
"dev": "next dev",
17-
"docker:build": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.yml build --progress=tty runner",
18-
"docker:develop": "cross-env DOCKER_BUILDKIT=1 docker-compose -f ./docker-compose.yml up",
19-
"docker:develop:reinstall": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.yml build --progress=tty --no-cache --force-rm develop",
17+
"docker:build": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.yml build --progress=tty runner",
18+
"docker:develop": "cross-env DOCKER_BUILDKIT=1 docker compose -f ./docker-compose.yml up",
19+
"docker:develop:reinstall": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.yml build --progress=tty --no-cache --force-rm develop",
2020
"docker:install": "docker buildx bake -f docker-compose.hobbies.yml --progress=tty deps",
2121
"docker:prune-cache": "docker buildx prune",
22-
"docker:serve": "docker-compose -f docker-compose.yml --env-file .env up runner",
22+
"docker:serve": "docker compose -f docker-compose.yml --env-file .env up runner",
2323
"generate:graphql": "DOTENV_CONFIG_PATH=./.env.local graphql-codegen -r dotenv/config --config ../../packages/components/codegen.ts",
2424
"get-translations": "node ./scripts/get-translations.js",
2525
"lint": "eslint . --ext .ts,.tsx,.js,.jsx,.cjs,.mjs,.mdx,.graphql --cache --cache-location ../../.cache/eslint/hobbies-helsinki.eslintcache",

apps/sports-helsinki/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ Run the development server:
273273
```
274274
yarn dev
275275
# or
276-
docker-compose up
276+
docker compose up
277277
```
278278

279279
Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

apps/sports-helsinki/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
"clean": "rimraf --no-glob ./.next ./out ./coverage ./tsconfig.tsbuildinfo",
1616
"dev": "next dev",
1717
"dev:debug": "cross-env NODE_OPTIONS='--inspect' next dev",
18-
"docker:build": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.yml build --progress=tty runner",
19-
"docker:develop": "cross-env DOCKER_BUILDKIT=1 docker-compose -f ./docker-compose.yml up",
20-
"docker:develop:reinstall": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.yml build --progress=tty --no-cache --force-rm develop",
18+
"docker:build": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.yml build --progress=tty runner",
19+
"docker:develop": "cross-env DOCKER_BUILDKIT=1 docker compose -f ./docker-compose.yml up",
20+
"docker:develop:reinstall": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.yml build --progress=tty --no-cache --force-rm develop",
2121
"docker:install": "docker buildx bake -f docker-compose.hobbies.yml --progress=tty deps",
2222
"docker:prune-cache": "docker buildx prune",
23-
"docker:serve": "docker-compose -f docker-compose.yml --env-file .env up runner",
23+
"docker:serve": "docker compose -f docker-compose.yml --env-file .env up runner",
2424
"generate:graphql": "DOTENV_CONFIG_PATH=./.env.local graphql-codegen -r dotenv/config --config ../../packages/components/codegen.ts",
2525
"get-translations": "node ./scripts/get-translations.js",
2626
"lint": "eslint . --ext .ts,.tsx,.js,.jsx,.cjs,.mjs,.mdx,.graphql --cache --cache-location ../../.cache/eslint/sports-helsinki.eslintcache",

docker-compose.events.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.9'
22
services:
33
# Start events in development
4-
# docker-compose -f docker-compose.events.yml up develop
4+
# docker compose -f docker-compose.events.yml up develop
55
develop:
66
container_name: events-helsinki-develop
77
# profiles:
@@ -110,7 +110,7 @@ services:
110110

111111
# Convenience production "runner" stage service for debugging
112112
# Build > docker buildx bake -f docker-compose.events-helsinki.yml --progress=tty runner
113-
# Run > docker-compose -f docker-compose.events-helsinki.yml --env-file ./apps/events-helsinki/.env.local up runner
113+
# Run > docker compose -f docker-compose.events-helsinki.yml --env-file ./apps/events-helsinki/.env.local up runner
114114
runner:
115115
container_name: events-helsinki-multistage-runner
116116
# profiles:

docker-compose.hobbies.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.9'
22
services:
33
# Start hobbies in development
4-
# docker-compose -f docker-compose.hobbies.yml up develop
4+
# docker compose -f docker-compose.hobbies.yml up develop
55
develop:
66
container_name: hobbies-helsinki-develop
77
# profiles:
@@ -110,7 +110,7 @@ services:
110110

111111
# Convenience production "runner" stage service for debugging
112112
# Build > docker buildx bake -f docker-compose.hobbies-helsinki.yml --progress=tty runner
113-
# Run > docker-compose -f docker-compose.hobbies-helsinki.yml --env-file ./apps/hobbies-helsinki/.env.local up runner
113+
# Run > docker compose -f docker-compose.hobbies-helsinki.yml --env-file ./apps/hobbies-helsinki/.env.local up runner
114114
runner:
115115
container_name: hobbies-helsinki-multistage-runner
116116
# profiles:

docker-compose.sports.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.9'
22
services:
33
# Start sports in development
4-
# docker-compose -f docker-compose.sports.yml up develop
4+
# docker compose -f docker-compose.sports.yml up develop
55
develop:
66
container_name: sports-helsinki-develop
77
# profiles:
@@ -110,7 +110,7 @@ services:
110110

111111
# Convenience production "runner" stage service for debugging
112112
# Build > docker buildx bake -f docker-compose.sports-helsinki.yml --progress=tty runner
113-
# Run > docker-compose -f docker-compose.sports-helsinki.yml --env-file ./apps/sports-helsinki/.env.local up runner
113+
# Run > docker compose -f docker-compose.sports-helsinki.yml --env-file ./apps/sports-helsinki/.env.local up runner
114114
runner:
115115
container_name: sports-helsinki-multistage-runner
116116
# profiles:

docs/docker/docker.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ and build time (taking advantage of buildx cache).
2525
## Requirements
2626

2727
- [x] [docker-engine](https://docs.docker.com/get-docker) >= 20.10.0
28-
- [x] docker-compose >= 1.29.0
28+
- [x] docker compose >= 1.29.0
2929
- [x] docker [buildkit](https://docs.docker.com/develop/develop-images/build_enhancements) enabled.
3030
- [x] optional: [lazydocker](https://github.com/jesseduffield/lazydocker), a beautiful tui.
3131
- [x] optional: [dive](https://github.com/wagoodman/dive) to debug layer sizes.
@@ -50,14 +50,14 @@ and build time (taking advantage of buildx cache).
5050
yarn docker:hobbies:develop
5151

5252
# Or alternatively
53-
DOCKER_BUILDKIT=1 docker-compose -f ./docker-compose.yml -f ./docker-compose.hobbies.yml up develop
53+
DOCKER_BUILDKIT=1 docker compose -f ./docker-compose.yml -f ./docker-compose.hobbies.yml up develop
5454
```
5555

5656
<details>
5757
<summary>Want to open a shell to debug ?</summary>
5858

5959
```bash
60-
DOCKER_BUILDKIT=1 docker-compose -f ./docker-compose.hobbies.yml run --rm develop sh
60+
DOCKER_BUILDKIT=1 docker compose -f ./docker-compose.hobbies.yml run --rm develop sh
6161
```
6262

6363
</details>
@@ -84,20 +84,20 @@ stages.
8484
To build it independently
8585

8686
```bash
87-
DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml build --progress=tty deps
87+
DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml build --progress=tty deps
8888
# docker buildx bake -f docker-compose.hobbies.yml --progress=tty deps
8989
```
9090

9191
To force a rebuild
9292

9393
```bash
94-
DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml build --no-cache --force-rm --progress=tty deps
94+
DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml build --no-cache --force-rm --progress=tty deps
9595
```
9696

9797
Want to open a shell into it ?
9898

9999
```bash
100-
DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml run --rm deps sh
100+
DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml run --rm deps sh
101101
```
102102

103103
</details>
@@ -114,20 +114,20 @@ Then build the thing and remove devDependencies.
114114
To build it independently
115115

116116
```bash
117-
DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml build --progress=tty builder
117+
DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml build --progress=tty builder
118118
# docker buildx bake -f docker-compose.hobbies.yml --progress=tty builder
119119
```
120120

121121
To force a rebuild
122122

123123
```bash
124-
DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml build --no-cache --force-rm --progress=tty builder
124+
DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml build --no-cache --force-rm --progress=tty builder
125125
```
126126

127127
Want to open a shell into it ?
128128

129129
```bash
130-
DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml run --rm builder sh
130+
DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml run --rm builder sh
131131
```
132132

133133
</details>
@@ -137,7 +137,7 @@ Then build the thing and remove devDependencies.
137137
Launch a production build and listen by default to http://localhost:3000.
138138

139139
```bash
140-
DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml --env-file .env.secret up runner
140+
DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml --env-file .env.secret up runner
141141
```
142142

143143
> PS: you'll have to provide your own .env with required runtime variables.
@@ -147,20 +147,20 @@ DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml --env-file .env.s
147147
To build it independently
148148

149149
```bash
150-
DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml build --progress=tty runner
150+
DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml build --progress=tty runner
151151
# docker buildx bake -f docker-compose.hobbies.yml --progress=tty runner
152152
```
153153

154154
To force a rebuild
155155

156156
```bash
157-
DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml build --no-cache --force-rm --progress=tty runner
157+
DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml build --no-cache --force-rm --progress=tty runner
158158
```
159159

160160
Want to open a shell into it ?
161161

162162
```bash
163-
DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml run --rm runner sh
163+
DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml run --rm runner sh
164164
```
165165

166166
</details>
@@ -181,13 +181,13 @@ Using the Sports-Helsinki app as an example.
181181
Build the cache-image (for the Sports-Helsinki app):
182182

183183
```
184-
docker-compose -f docker-compose.sports.yml --env-file ./apps/sports-helsinki/.env.local build cache
184+
docker compose -f docker-compose.sports.yml --env-file ./apps/sports-helsinki/.env.local build cache
185185
```
186186

187187
Build the app runner image (for the Sports-Helsinki app) by using the cache-image as a base image:
188188

189189
```
190-
BUILDER_FROM_IMAGE=events-helsinki-monorepo-cache:latest docker-compose -f docker-compose.sports.yml --env-file ./apps/sports-helsinki/.env.local build runner
190+
BUILDER_FROM_IMAGE=events-helsinki-monorepo-cache:latest docker compose -f docker-compose.sports.yml --env-file ./apps/sports-helsinki/.env.local build runner
191191
```
192192

193193
## Remove docker

0 commit comments

Comments
 (0)