Update docker compose commands and instructions

apps/events-helsinki/README.md

@@ -87,7 +87,7 @@ Run the development server:
 ```
 yarn dev
 # or
-docker-compose up
+docker compose up
 ```
 
 Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

apps/events-helsinki/package.json

@@ -14,12 +14,12 @@
     "check-size": "size-limit --highlight-less",
     "clean": "rimraf --no-glob ./.next ./out ./coverage ./tsconfig.tsbuildinfo",
     "dev": "next dev",
-    "docker:build": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.yml build --progress=tty runner",
-    "docker:develop": "cross-env DOCKER_BUILDKIT=1 docker-compose -f ./docker-compose.yml up",
-    "docker:develop:reinstall": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.yml build --progress=tty --no-cache --force-rm develop",
+    "docker:build": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.yml build --progress=tty runner",
+    "docker:develop": "cross-env DOCKER_BUILDKIT=1 docker compose -f ./docker-compose.yml up",
+    "docker:develop:reinstall": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.yml build --progress=tty --no-cache --force-rm develop",
     "docker:install": "docker buildx bake -f docker-compose.events.yml --progress=tty deps",
     "docker:prune-cache": "docker buildx prune",
-    "docker:serve": "docker-compose -f docker-compose.yml --env-file .env up runner",
+    "docker:serve": "docker compose -f docker-compose.yml --env-file .env up runner",
     "generate:graphql": "DOTENV_CONFIG_PATH=./.env.local graphql-codegen -r dotenv/config --config ../../packages/components/codegen.ts",
     "get-translations": "node ./scripts/get-translations.js",
     "lint": "eslint . --ext .ts,.tsx,.js,.jsx,.cjs,.mjs,.mdx,.graphql --cache --cache-location ../../.cache/eslint/events-helsinki.eslintcache",

apps/hobbies-helsinki/README.md

@@ -87,7 +87,7 @@ Run the development server:
 ```
 yarn dev
 # or
-docker-compose up
+docker compose up
 ```
 
 Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

apps/hobbies-helsinki/package.json

@@ -14,12 +14,12 @@
     "check-size": "size-limit --highlight-less",
     "clean": "rimraf --no-glob ./.next ./out ./coverage ./tsconfig.tsbuildinfo",
     "dev": "next dev",
-    "docker:build": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.yml build --progress=tty runner",
-    "docker:develop": "cross-env DOCKER_BUILDKIT=1 docker-compose -f ./docker-compose.yml up",
-    "docker:develop:reinstall": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.yml build --progress=tty --no-cache --force-rm develop",
+    "docker:build": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.yml build --progress=tty runner",
+    "docker:develop": "cross-env DOCKER_BUILDKIT=1 docker compose -f ./docker-compose.yml up",
+    "docker:develop:reinstall": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.yml build --progress=tty --no-cache --force-rm develop",
     "docker:install": "docker buildx bake -f docker-compose.hobbies.yml --progress=tty deps",
     "docker:prune-cache": "docker buildx prune",
-    "docker:serve": "docker-compose -f docker-compose.yml --env-file .env up runner",
+    "docker:serve": "docker compose -f docker-compose.yml --env-file .env up runner",
     "generate:graphql": "DOTENV_CONFIG_PATH=./.env.local graphql-codegen -r dotenv/config --config ../../packages/components/codegen.ts",
     "get-translations": "node ./scripts/get-translations.js",
     "lint": "eslint . --ext .ts,.tsx,.js,.jsx,.cjs,.mjs,.mdx,.graphql --cache --cache-location ../../.cache/eslint/hobbies-helsinki.eslintcache",

apps/sports-helsinki/README.md

@@ -273,7 +273,7 @@ Run the development server:
 ```
 yarn dev
 # or
-docker-compose up
+docker compose up
 ```
 
 Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

apps/sports-helsinki/package.json

@@ -15,12 +15,12 @@
     "clean": "rimraf --no-glob ./.next ./out ./coverage ./tsconfig.tsbuildinfo",
     "dev": "next dev",
     "dev:debug": "cross-env NODE_OPTIONS='--inspect' next dev",
-    "docker:build": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.yml build --progress=tty runner",
-    "docker:develop": "cross-env DOCKER_BUILDKIT=1 docker-compose -f ./docker-compose.yml up",
-    "docker:develop:reinstall": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.yml build --progress=tty --no-cache --force-rm develop",
+    "docker:build": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.yml build --progress=tty runner",
+    "docker:develop": "cross-env DOCKER_BUILDKIT=1 docker compose -f ./docker-compose.yml up",
+    "docker:develop:reinstall": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.yml build --progress=tty --no-cache --force-rm develop",
     "docker:install": "docker buildx bake -f docker-compose.hobbies.yml --progress=tty deps",
     "docker:prune-cache": "docker buildx prune",
-    "docker:serve": "docker-compose -f docker-compose.yml --env-file .env up runner",
+    "docker:serve": "docker compose -f docker-compose.yml --env-file .env up runner",
     "generate:graphql": "DOTENV_CONFIG_PATH=./.env.local graphql-codegen -r dotenv/config --config ../../packages/components/codegen.ts",
     "get-translations": "node ./scripts/get-translations.js",
     "lint": "eslint . --ext .ts,.tsx,.js,.jsx,.cjs,.mjs,.mdx,.graphql --cache --cache-location ../../.cache/eslint/sports-helsinki.eslintcache",

docker-compose.events-graphql-proxy.yml

@@ -1,4 +1,3 @@
-version: '3.9'
 services:
   events-graphql-proxy:
     container_name: events-graphql-proxy

docker-compose.events.yml

@@ -1,7 +1,6 @@
-version: '3.9'
 services:
   # Start events in development
-  # docker-compose -f docker-compose.events.yml up develop
+  # docker compose -f docker-compose.events.yml up develop
   develop:
     container_name: events-helsinki-develop
     # profiles:
@@ -110,7 +109,7 @@ services:
 
   # Convenience production "runner" stage service for debugging
   # Build > docker buildx bake -f docker-compose.events-helsinki.yml --progress=tty runner
-  # Run   > docker-compose -f docker-compose.events-helsinki.yml --env-file ./apps/events-helsinki/.env.local up runner
+  # Run   > docker compose -f docker-compose.events-helsinki.yml --env-file ./apps/events-helsinki/.env.local up runner
   runner:
     container_name: events-helsinki-multistage-runner
     # profiles:

docker-compose.hobbies.yml

@@ -1,7 +1,6 @@
-version: '3.9'
 services:
   # Start hobbies in development
-  # docker-compose -f docker-compose.hobbies.yml up develop
+  # docker compose -f docker-compose.hobbies.yml up develop
   develop:
     container_name: hobbies-helsinki-develop
     # profiles:
@@ -110,7 +109,7 @@ services:
 
   # Convenience production "runner" stage service for debugging
   # Build > docker buildx bake -f docker-compose.hobbies-helsinki.yml --progress=tty runner
-  # Run   > docker-compose -f docker-compose.hobbies-helsinki.yml --env-file ./apps/hobbies-helsinki/.env.local up runner
+  # Run   > docker compose -f docker-compose.hobbies-helsinki.yml --env-file ./apps/hobbies-helsinki/.env.local up runner
   runner:
     container_name: hobbies-helsinki-multistage-runner
     # profiles:

docker-compose.sports.yml

@@ -1,7 +1,6 @@
-version: '3.9'
 services:
   # Start sports in development
-  # docker-compose -f docker-compose.sports.yml up develop
+  # docker compose -f docker-compose.sports.yml up develop
   develop:
     container_name: sports-helsinki-develop
     # profiles:
@@ -110,7 +109,7 @@ services:
 
   # Convenience production "runner" stage service for debugging
   # Build > docker buildx bake -f docker-compose.sports-helsinki.yml --progress=tty runner
-  # Run   > docker-compose -f docker-compose.sports-helsinki.yml --env-file ./apps/sports-helsinki/.env.local up runner
+  # Run   > docker compose -f docker-compose.sports-helsinki.yml --env-file ./apps/sports-helsinki/.env.local up runner
   runner:
     container_name: sports-helsinki-multistage-runner
     # profiles:

docker-compose.venue-graphql-proxy.yml

@@ -1,4 +1,3 @@
-version: '3.9'
 services:
   venue-graphql-proxy:
     container_name: venue-graphql-proxy

docs/docker/docker.md

@@ -25,7 +25,7 @@ and build time (taking advantage of buildx cache).
 ## Requirements
 
 - [x] [docker-engine](https://docs.docker.com/get-docker) >= 20.10.0
-- [x] docker-compose >= 1.29.0
+- [x] docker compose >= 1.29.0
 - [x] docker [buildkit](https://docs.docker.com/develop/develop-images/build_enhancements) enabled.
 - [x] optional: [lazydocker](https://github.com/jesseduffield/lazydocker), a beautiful tui.
 - [x] optional: [dive](https://github.com/wagoodman/dive) to debug layer sizes.
@@ -50,14 +50,14 @@ and build time (taking advantage of buildx cache).
 yarn docker:hobbies:develop
 
 # Or alternatively
-DOCKER_BUILDKIT=1 docker-compose -f ./docker-compose.yml -f ./docker-compose.hobbies.yml up develop
+DOCKER_BUILDKIT=1 docker compose -f ./docker-compose.yml -f ./docker-compose.hobbies.yml up develop
 ```
 
 <details>
   <summary>Want to open a shell to debug ?</summary>
 
   ```bash
-  DOCKER_BUILDKIT=1 docker-compose -f ./docker-compose.hobbies.yml run --rm develop sh
+  DOCKER_BUILDKIT=1 docker compose -f ./docker-compose.hobbies.yml run --rm develop sh
   ```
 
 </details>
@@ -84,20 +84,20 @@ stages.
   To build it independently
 
   ```bash
-  DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml build --progress=tty deps
+  DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml build --progress=tty deps
   # docker buildx bake -f docker-compose.hobbies.yml --progress=tty deps
   ```
 
   To force a rebuild
 
   ```bash
-  DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml build --no-cache --force-rm --progress=tty deps
+  DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml build --no-cache --force-rm --progress=tty deps
   ```
 
   Want to open a shell into it ?
 
   ```bash
-  DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml run --rm deps sh
+  DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml run --rm deps sh
   ```
 
 </details>
@@ -114,20 +114,20 @@ Then build the thing and remove devDependencies.
   To build it independently
 
   ```bash
-  DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml build --progress=tty builder
+  DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml build --progress=tty builder
   # docker buildx bake -f docker-compose.hobbies.yml --progress=tty builder
   ```
 
   To force a rebuild
 
   ```bash
-  DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml build --no-cache --force-rm --progress=tty builder
+  DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml build --no-cache --force-rm --progress=tty builder
   ```
 
   Want to open a shell into it ?
 
   ```bash
-  DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml run --rm builder sh
+  DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml run --rm builder sh
   ```
 
 </details>
@@ -137,7 +137,7 @@ Then build the thing and remove devDependencies.
 Launch a production build and listen by default to http://localhost:3000.
 
 ```bash
-DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml --env-file .env.secret up runner
+DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml --env-file .env.secret up runner
 ```
 
 > 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
   To build it independently
 
   ```bash
-  DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml build --progress=tty runner
+  DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml build --progress=tty runner
   # docker buildx bake -f docker-compose.hobbies.yml --progress=tty runner
   ```
 
   To force a rebuild
 
   ```bash
-  DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml build --no-cache --force-rm --progress=tty runner
+  DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml build --no-cache --force-rm --progress=tty runner
   ```
 
   Want to open a shell into it ?
 
   ```bash
-  DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml run --rm runner sh
+  DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml run --rm runner sh
   ```
 
 </details>
@@ -181,13 +181,13 @@ Using the Sports-Helsinki app as an example.
 Build the cache-image (for the Sports-Helsinki app):
 
 ```
-docker-compose -f docker-compose.sports.yml --env-file ./apps/sports-helsinki/.env.local build cache
+docker compose -f docker-compose.sports.yml --env-file ./apps/sports-helsinki/.env.local build cache
 ```
 
 Build the app runner image (for the Sports-Helsinki app) by using the cache-image as a base image:
 
 ```
-BUILDER_FROM_IMAGE=events-helsinki-monorepo-cache:latest docker-compose -f docker-compose.sports.yml --env-file ./apps/sports-helsinki/.env.local build runner
+BUILDER_FROM_IMAGE=events-helsinki-monorepo-cache:latest docker compose -f docker-compose.sports.yml --env-file ./apps/sports-helsinki/.env.local build runner
 ```
 
 ## Remove docker