From 7c01656c16138e3622f8048dc1bb6fcd76f14cf1 Mon Sep 17 00:00:00 2001
From: Niko Lindroos <niko.j.makela@gmail.com>
Date: Fri, 29 Aug 2025 13:41:03 +0300
Subject: [PATCH 1/2] chore(docker): update docker-compose commands

TH-1422.

Change all `docker-compose` commands to `docker compose`.
---
 apps/events-helsinki/README.md              |  2 +-
 apps/events-helsinki/package.json           |  8 ++---
 apps/hobbies-helsinki/README.md             |  2 +-
 apps/hobbies-helsinki/package.json          |  8 ++---
 apps/sports-helsinki/README.md              |  2 +-
 apps/sports-helsinki/package.json           |  8 ++---
 docker-compose.events.yml                   |  4 +--
 docker-compose.hobbies.yml                  |  4 +--
 docker-compose.sports.yml                   |  4 +--
 docs/docker/docker.md                       | 30 ++++++++---------
 package.json                                | 36 ++++++++++-----------
 packages/graphql-proxy-server/README.md     |  4 +--
 packages/graphql-proxy-server/package.json  |  8 ++---
 proxies/events-graphql-federation/README.md |  6 ++--
 proxies/events-graphql-proxy/README.md      |  4 +--
 proxies/events-graphql-proxy/package.json   |  8 ++---
 proxies/venue-graphql-proxy/README.md       |  4 +--
 proxies/venue-graphql-proxy/package.json    |  8 ++---
 18 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/apps/events-helsinki/README.md b/apps/events-helsinki/README.md
index d74b0430e..e6e48aaee 100644
--- a/apps/events-helsinki/README.md
+++ b/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.
diff --git a/apps/events-helsinki/package.json b/apps/events-helsinki/package.json
index 98bcf9873..d9d315745 100644
--- a/apps/events-helsinki/package.json
+++ b/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",
diff --git a/apps/hobbies-helsinki/README.md b/apps/hobbies-helsinki/README.md
index 06e8a022d..299bf4da2 100644
--- a/apps/hobbies-helsinki/README.md
+++ b/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.
diff --git a/apps/hobbies-helsinki/package.json b/apps/hobbies-helsinki/package.json
index cc4d22764..7782901d8 100644
--- a/apps/hobbies-helsinki/package.json
+++ b/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",
diff --git a/apps/sports-helsinki/README.md b/apps/sports-helsinki/README.md
index 4de505255..cc7ac479b 100644
--- a/apps/sports-helsinki/README.md
+++ b/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.
diff --git a/apps/sports-helsinki/package.json b/apps/sports-helsinki/package.json
index 244847c0c..f039661b8 100644
--- a/apps/sports-helsinki/package.json
+++ b/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",
diff --git a/docker-compose.events.yml b/docker-compose.events.yml
index 056442083..0a9e6aa0d 100644
--- a/docker-compose.events.yml
+++ b/docker-compose.events.yml
@@ -1,7 +1,7 @@
 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 +110,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:
diff --git a/docker-compose.hobbies.yml b/docker-compose.hobbies.yml
index cbf6daeeb..07d9f1c4d 100644
--- a/docker-compose.hobbies.yml
+++ b/docker-compose.hobbies.yml
@@ -1,7 +1,7 @@
 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 +110,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:
diff --git a/docker-compose.sports.yml b/docker-compose.sports.yml
index e43ab8c24..309353313 100644
--- a/docker-compose.sports.yml
+++ b/docker-compose.sports.yml
@@ -1,7 +1,7 @@
 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 +110,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:
diff --git a/docs/docker/docker.md b/docs/docker/docker.md
index 3194f2af1..276860135 100644
--- a/docs/docker/docker.md
+++ b/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
diff --git a/package.json b/package.json
index 1557f4127..81c1b27f9 100644
--- a/package.json
+++ b/package.json
@@ -40,26 +40,26 @@
     "packages:clean": "yarn workspaces foreach -ptv --include '@events-helsinki/*' run clean",
     "docker:prune-cache": "docker buildx prune",
     "docker:hobbies:install": "docker buildx bake -f docker-compose.hobbies.yml --progress=tty deps",
-    "docker:hobbies:develop": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml up develop",
-    "docker:hobbies:develop:reinstall": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml build --progress=tty --no-cache --force-rm develop",
-    "docker:hobbies:build": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.hobbies.yml --env-file ./apps/hobbies-helsinki/.env.local build --progress=tty runner",
-    "docker:hobbies:serve": "docker-compose -f docker-compose.hobbies.yml --env-file ./apps/hobbies-helsinki/.env.local up runner",
+    "docker:hobbies:develop": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml up develop",
+    "docker:hobbies:develop:reinstall": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml build --progress=tty --no-cache --force-rm develop",
+    "docker:hobbies:build": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.hobbies.yml --env-file ./apps/hobbies-helsinki/.env.local build --progress=tty runner",
+    "docker:hobbies:serve": "docker compose -f docker-compose.hobbies.yml --env-file ./apps/hobbies-helsinki/.env.local up runner",
     "docker:events:install": "docker buildx bake -f docker-compose.events.yml --progress=tty deps",
-    "docker:events:develop": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.events.yml up develop",
-    "docker:events:develop:reinstall": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.events.yml build --progress=tty --no-cache --force-rm develop",
-    "docker:events:build": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.events.yml --env-file ./apps/events-helsinki/.env.local build --progress=tty runner",
-    "docker:events:serve": "docker-compose -f docker-compose.events.yml --env-file ./apps/events-helsinki/.env.local up runner",
+    "docker:events:develop": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.events.yml up develop",
+    "docker:events:develop:reinstall": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.events.yml build --progress=tty --no-cache --force-rm develop",
+    "docker:events:build": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.events.yml --env-file ./apps/events-helsinki/.env.local build --progress=tty runner",
+    "docker:events:serve": "docker compose -f docker-compose.events.yml --env-file ./apps/events-helsinki/.env.local up runner",
     "docker:sports:install": "docker buildx bake -f docker-compose.sports.yml --progress=tty deps",
-    "docker:sports:develop": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.sports.yml up develop",
-    "docker:sports:develop:reinstall": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.sports.yml build --progress=tty --no-cache --force-rm develop",
-    "docker:sports:build": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.sports.yml --env-file ./apps/sports-helsinki/.env.local build --progress=tty runner",
-    "docker:sports:serve": "docker-compose -f docker-compose.sports.yml --env-file ./apps/sports-helsinki/.env.local up runner",
-    "docker:events-graphql-proxy": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.events-graphql-proxy.yml --env-file ./proxies/events-graphql-proxy/.env up events-graphql-proxy",
-    "docker:venue-graphql-proxy": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.venue-graphql-proxy.yml --env-file ./proxies/venue-graphql-proxy/.env up venue-graphql-proxy",
-    "docker:graphql-router:hobbies:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://harrastus.app-staging.hkih.hion.dev/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker-compose -f docker-compose.router.yml up",
-    "docker:graphql-router:events:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://tapahtumat.app-staging.hkih.hion.dev/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker-compose -f docker-compose.router.yml up",
-    "docker:graphql-router:sports:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://liikunta.app-staging.hkih.hion.dev/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker-compose -f docker-compose.router.yml up",
-    "docker:down": "docker-compose down",
+    "docker:sports:develop": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.sports.yml up develop",
+    "docker:sports:develop:reinstall": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.sports.yml build --progress=tty --no-cache --force-rm develop",
+    "docker:sports:build": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.sports.yml --env-file ./apps/sports-helsinki/.env.local build --progress=tty runner",
+    "docker:sports:serve": "docker compose -f docker-compose.sports.yml --env-file ./apps/sports-helsinki/.env.local up runner",
+    "docker:events-graphql-proxy": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.events-graphql-proxy.yml --env-file ./proxies/events-graphql-proxy/.env up events-graphql-proxy",
+    "docker:venue-graphql-proxy": "cross-env DOCKER_BUILDKIT=1 docker compose -f docker-compose.venue-graphql-proxy.yml --env-file ./proxies/venue-graphql-proxy/.env up venue-graphql-proxy",
+    "docker:graphql-router:hobbies:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://harrastus.app-staging.hkih.hion.dev/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker compose -f docker-compose.router.yml up",
+    "docker:graphql-router:events:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://tapahtumat.app-staging.hkih.hion.dev/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker compose -f docker-compose.router.yml up",
+    "docker:graphql-router:sports:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://liikunta.app-staging.hkih.hion.dev/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker compose -f docker-compose.router.yml up",
+    "docker:down": "docker compose down",
     "docker:nuke-all": "npm-run-all --sequential --continue-on-error --print-label \"docker:nuke:*\"",
     "docker:nuke:images": "docker image rm -f $(docker image ls -q)",
     "docker:nuke:containers": "docker container rm -f $(docker container ls -qa)",
diff --git a/packages/graphql-proxy-server/README.md b/packages/graphql-proxy-server/README.md
index a520ac704..ca0fda322 100644
--- a/packages/graphql-proxy-server/README.md
+++ b/packages/graphql-proxy-server/README.md
@@ -7,11 +7,11 @@ To build the project, you will need [Docker](https://www.docker.com/community-ed
 Building the project
 
     cp .env.example .env
-    docker-compose build
+    docker compose build
 
 Starting the application
 
-    docker-compose up -d
+    docker compose up -d
 
 GraphQL playground will run on http://localhost:4000/proxy/graphql
 
diff --git a/packages/graphql-proxy-server/package.json b/packages/graphql-proxy-server/package.json
index 40233bfc5..c253c0685 100644
--- a/packages/graphql-proxy-server/package.json
+++ b/packages/graphql-proxy-server/package.json
@@ -7,12 +7,12 @@
   "main": "./src/index.ts",
   "scripts": {
     "clean": "rimraf --no-glob ./tsconfig.tsbuildinfo",
-    "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.proxy.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",
     "lint": "eslint . --ext .ts,.tsx,.js,.jsx,.cjs,.mjs,.mdx,.graphql --cache --cache-location ../../.cache/eslint/events-graphql-proxy.eslintcache",
     "lint-fix": "eslint . --ext .ts,.tsx,.js,.jsx,.cjs,.mjs,.mdx,.graphql --fix",
     "pre-commit": "lint-fix",
diff --git a/proxies/events-graphql-federation/README.md b/proxies/events-graphql-federation/README.md
index b93c1f977..5d2a89018 100644
--- a/proxies/events-graphql-federation/README.md
+++ b/proxies/events-graphql-federation/README.md
@@ -71,9 +71,9 @@ In the `package.json` of the root in the monorepo, there is a script that can be
 
 ```javascript
   "scripts": {
-    "docker:graphql-router:hobbies:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://harrastus.app-staging.hkih.hion.dev/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker-compose -f docker-compose.router.yml up",
-    "docker:graphql-router:events:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://tapahtumat.app-staging.hkih.hion.dev/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker-compose -f docker-compose.router.yml up",
-    "docker:graphql-router:sports:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://liikunta.app-staging.hkih.hion.dev/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker-compose -f docker-compose.router.yml up",
+    "docker:graphql-router:hobbies:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://harrastus.app-staging.hkih.hion.dev/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker compose -f docker-compose.router.yml up",
+    "docker:graphql-router:events:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://tapahtumat.app-staging.hkih.hion.dev/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker compose -f docker-compose.router.yml up",
+    "docker:graphql-router:sports:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://liikunta.app-staging.hkih.hion.dev/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker compose -f docker-compose.router.yml up",
   }
 ```
 
diff --git a/proxies/events-graphql-proxy/README.md b/proxies/events-graphql-proxy/README.md
index 42d784205..3fcec6148 100644
--- a/proxies/events-graphql-proxy/README.md
+++ b/proxies/events-graphql-proxy/README.md
@@ -7,11 +7,11 @@ To build the project, you will need [Docker](https://www.docker.com/community-ed
 Building the project
 
     cp .env.example .env
-    docker-compose build
+    docker compose build
 
 Starting the application
 
-    docker-compose up -d
+    docker compose up -d
 
 GraphQL playground will run on http://localhost:4000/proxy/graphql
 
diff --git a/proxies/events-graphql-proxy/package.json b/proxies/events-graphql-proxy/package.json
index a4c4f7339..c17cdf91e 100644
--- a/proxies/events-graphql-proxy/package.json
+++ b/proxies/events-graphql-proxy/package.json
@@ -9,12 +9,12 @@
     "check-dist": "",
     "clean": "rimraf --no-glob ./tsconfig.tsbuildinfo",
     "dev": "cross-env DOTENV_CONFIG_PATH=./.env nodemon ./src/index.ts",
-    "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.proxy.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",
     "lint": "eslint . --ext .ts,.tsx,.js,.jsx,.cjs,.mjs,.mdx,.graphql --cache --cache-location ../../.cache/eslint/events-graphql-proxy.eslintcache",
     "lint-fix": "eslint . --ext .ts,.tsx,.js,.jsx,.cjs,.mjs,.mdx,.graphql --fix",
     "pre-commit": "lint-fix",
diff --git a/proxies/venue-graphql-proxy/README.md b/proxies/venue-graphql-proxy/README.md
index a520ac704..ca0fda322 100644
--- a/proxies/venue-graphql-proxy/README.md
+++ b/proxies/venue-graphql-proxy/README.md
@@ -7,11 +7,11 @@ To build the project, you will need [Docker](https://www.docker.com/community-ed
 Building the project
 
     cp .env.example .env
-    docker-compose build
+    docker compose build
 
 Starting the application
 
-    docker-compose up -d
+    docker compose up -d
 
 GraphQL playground will run on http://localhost:4000/proxy/graphql
 
diff --git a/proxies/venue-graphql-proxy/package.json b/proxies/venue-graphql-proxy/package.json
index f02491ab7..d1675dac7 100644
--- a/proxies/venue-graphql-proxy/package.json
+++ b/proxies/venue-graphql-proxy/package.json
@@ -9,12 +9,12 @@
     "check-dist": "",
     "clean": "rimraf --no-glob ./tsconfig.tsbuildinfo",
     "dev": "cross-env DOTENV_CONFIG_PATH=./.env nodemon ./src/index.ts",
-    "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.proxy.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",
     "lint": "eslint . --ext .ts,.tsx,.js,.jsx,.cjs,.mjs,.mdx,.graphql --cache --cache-location ../../.cache/eslint/venue-graphql-proxy.eslintcache",
     "lint-fix": "eslint . --ext .ts,.tsx,.js,.jsx,.cjs,.mjs,.mdx,.graphql --fix",
     "pre-commit": "lint-fix",

From 1ae342a195b76d5c0f3ce29ebfa1bd76aba19287 Mon Sep 17 00:00:00 2001
From: Niko Lindroos <niko.j.makela@gmail.com>
Date: Fri, 29 Aug 2025 13:48:07 +0300
Subject: [PATCH 2/2] chore(docker): remove deprecated version key from
 docker-compose files

TH-1422
---
 docker-compose.events-graphql-proxy.yml | 1 -
 docker-compose.events.yml               | 1 -
 docker-compose.hobbies.yml              | 1 -
 docker-compose.sports.yml               | 1 -
 docker-compose.venue-graphql-proxy.yml  | 1 -
 5 files changed, 5 deletions(-)

diff --git a/docker-compose.events-graphql-proxy.yml b/docker-compose.events-graphql-proxy.yml
index be98b6730..e76eaa058 100644
--- a/docker-compose.events-graphql-proxy.yml
+++ b/docker-compose.events-graphql-proxy.yml
@@ -1,4 +1,3 @@
-version: '3.9'
 services:
   events-graphql-proxy:
     container_name: events-graphql-proxy
diff --git a/docker-compose.events.yml b/docker-compose.events.yml
index 0a9e6aa0d..e2d1d3183 100644
--- a/docker-compose.events.yml
+++ b/docker-compose.events.yml
@@ -1,4 +1,3 @@
-version: '3.9'
 services:
   # Start events in development
   # docker compose -f docker-compose.events.yml up develop
diff --git a/docker-compose.hobbies.yml b/docker-compose.hobbies.yml
index 07d9f1c4d..489d612d6 100644
--- a/docker-compose.hobbies.yml
+++ b/docker-compose.hobbies.yml
@@ -1,4 +1,3 @@
-version: '3.9'
 services:
   # Start hobbies in development
   # docker compose -f docker-compose.hobbies.yml up develop
diff --git a/docker-compose.sports.yml b/docker-compose.sports.yml
index 309353313..abf80e7e8 100644
--- a/docker-compose.sports.yml
+++ b/docker-compose.sports.yml
@@ -1,4 +1,3 @@
-version: '3.9'
 services:
   # Start sports in development
   # docker compose -f docker-compose.sports.yml up develop
diff --git a/docker-compose.venue-graphql-proxy.yml b/docker-compose.venue-graphql-proxy.yml
index b85f07b78..9f996f5ec 100644
--- a/docker-compose.venue-graphql-proxy.yml
+++ b/docker-compose.venue-graphql-proxy.yml
@@ -1,4 +1,3 @@
-version: '3.9'
 services:
   venue-graphql-proxy:
     container_name: venue-graphql-proxy