From 9179fdb2fabfd7b03476c37b915857514111b49f Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 17 Jan 2025 10:08:44 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7(compose)=20rename=20legacy=20docke?= =?UTF-8?q?r-compose.yml=20in=20compose.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The compose configuration preferred filename is now compose.yaml docker-compose.yml is the legacy one used by docker-compose v1 --- README.md | 10 ++++------ bin/_config.sh | 2 +- docker-compose.yml => compose.yaml | 0 3 files changed, 5 insertions(+), 7 deletions(-) rename docker-compose.yml => compose.yaml (100%) diff --git a/README.md b/README.md index 27b1af11f..26d57bbdc 100644 --- a/README.md +++ b/README.md @@ -52,12 +52,10 @@ Make sure you have a recent version of Docker and [Docker Compose](https://docs. ```shellscript $ docker -v + Docker version 27.4.1, build b9d17ea -Docker version 20.10.2, build 2291f61 - -$ docker compose -v - -docker compose version 1.27.4, build 40524192 +$ docker compose version + Docker Compose version v2.32.1 ``` > ⚠️ You may need to run the following commands with sudo but this can be avoided by assigning your user to the `docker` group. @@ -170,4 +168,4 @@ docs Impress is built on top of [Django Rest Framework](https://www.django-rest-framework.org/), [Next.js](https://nextjs.org/), [MinIO](https://min.io/) and [BlocNote.js](https://www.blocknotejs.org/) ### States ❤️ open source -Docs is the result of a joint effort lead by the French 🇫🇷🥖 ([DINUM](https://www.numerique.gouv.fr/dinum/)) and German 🇩🇪🥨 government ([ZenDiS](https://zendis.de/)). We are always looking for new public partners feel free to reach out if you are interested in using or contributing to docs. \ No newline at end of file +Docs is the result of a joint effort lead by the French 🇫🇷🥖 ([DINUM](https://www.numerique.gouv.fr/dinum/)) and German 🇩🇪🥨 government ([ZenDiS](https://zendis.de/)). We are always looking for new public partners feel free to reach out if you are interested in using or contributing to docs. diff --git a/bin/_config.sh b/bin/_config.sh index 5ec03c465..dd2a5c29c 100644 --- a/bin/_config.sh +++ b/bin/_config.sh @@ -6,7 +6,7 @@ REPO_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd)" UNSET_USER=0 TERRAFORM_DIRECTORY="./env.d/terraform" -COMPOSE_FILE="${REPO_DIR}/docker-compose.yml" +COMPOSE_FILE="${REPO_DIR}/compose.yaml" COMPOSE_PROJECT="docs" diff --git a/docker-compose.yml b/compose.yaml similarity index 100% rename from docker-compose.yml rename to compose.yaml