From 0c04a32e509ead46efdf7f8f4daff37857c8ca67 Mon Sep 17 00:00:00 2001
From: Sasha Shpota <5640984+Shpota@users.noreply.github.com>
Date: Sun, 1 Sep 2024 10:23:29 +0200
Subject: [PATCH] Use Docker-managed Compose version (#140)

---
 .github/README.md            |  4 ++--
 .github/README_by.md         |  2 +-
 .github/README_es.md         |  2 +-
 .github/README_fr.md         |  2 +-
 .github/README_he.md         |  2 +-
 .github/README_id.md         |  2 +-
 .github/README_jp.md         |  2 +-
 .github/README_ko.md         |  2 +-
 .github/README_pt-br.md      |  2 +-
 .github/README_tr.md         |  2 +-
 .github/README_ua.md         |  2 +-
 .github/README_zh.md         |  2 +-
 static/generated.go          | 39 ++++++++++++++----------------------
 templates/mongo.README.md    | 13 +++++-------
 templates/mysql.README.md    | 13 +++++-------
 templates/postgres.README.md | 13 +++++-------
 16 files changed, 43 insertions(+), 61 deletions(-)

diff --git a/.github/README.md b/.github/README.md
index d3ecf44..84652c7 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -139,11 +139,11 @@ go run github.com/shpota/goxygen@latest init --frontend vue --db postgres my-app
 The `--frontend` flag accepts `angular`, `react` and `vue`.
 The `--db` flag accepts `mongo`, `mysql` and `postgres`.
 
-The generated project is ready to run with `docker-compose`:
+The generated project is ready to run with Docker Compose`:
 
 ```sh
 cd my-app
-docker-compose up
+docker compose up
 ```
 
 After the build is completed, the application is accessible
diff --git a/.github/README_by.md b/.github/README_by.md
index ade45dd..f08301d 100644
--- a/.github/README_by.md
+++ b/.github/README_by.md
@@ -121,7 +121,7 @@ go run github.com/shpota/goxygen init --frontend vue --db postgres my-app
 Сфарміраваны праект гатовы да запуску з `docker-compose`: 
 ```sh
 cd my-app
-docker-compose up
+docker compose up
 ```
 Пасля завяршэння зборкі, дадатак будзе даступны на
 http://localhost:8080.
diff --git a/.github/README_es.md b/.github/README_es.md
index bea364a..75584da 100644
--- a/.github/README_es.md
+++ b/.github/README_es.md
@@ -120,7 +120,7 @@ The `--db` flag accepts `mongo`, `mysql` and `postgres`.
 El proyecto generado se puede correr utilizando `docker-compose`:
 ```sh
 cd my-app
-docker-compose up
+docker compose up
 ```
 
 Una vez la construccion se haya completado la aplicacion estara accesible 
diff --git a/.github/README_fr.md b/.github/README_fr.md
index 706b31a..9675dc3 100644
--- a/.github/README_fr.md
+++ b/.github/README_fr.md
@@ -123,7 +123,7 @@ Le projet généré est prêt à l'utilisation avec `docker-compose`:
 
 ```sh
 cd my-app
-docker-compose up
+docker compose up
 ```
 
 Aprés la fin du build, l'application est
diff --git a/.github/README_he.md b/.github/README_he.md
index 62ae3c2..a79fdcf 100644
--- a/.github/README_he.md
+++ b/.github/README_he.md
@@ -143,7 +143,7 @@ go run github.com/shpota/goxygen init --frontend vue --db postgres my-app
 
 ```sh
 cd my-app
-docker-compose up
+docker compose up
 ```
 
 <div dir="rtl">
diff --git a/.github/README_id.md b/.github/README_id.md
index 7ddf549..043d17e 100644
--- a/.github/README_id.md
+++ b/.github/README_id.md
@@ -124,7 +124,7 @@ The `--db` flag accepts `mongo`, `mysql` and `postgres`.
 Proyek yang telah di generate dapat dijalankan dengan perintah `docker-compose`:
 ```sh
 cd my-app
-docker-compose up
+docker compose up
 ```
 Setelah proses build selesai, aplikasi dapat diakses
 pada http://localhost:8080.
diff --git a/.github/README_jp.md b/.github/README_jp.md
index 88ae2e7..2b42b05 100644
--- a/.github/README_jp.md
+++ b/.github/README_jp.md
@@ -120,7 +120,7 @@ go run github.com/shpota/goxygen init --frontend vue --db postgres my-app
 生成されたプロジェクトは、`docker-compse` で実行する準備が整っています:
 ```sh
 cd my-app
-docker-compose up
+docker compose up
 ```
 ビルドが完了後、アプリケーションは http://localhost:8080 でアクセスできるように
 なります。
diff --git a/.github/README_ko.md b/.github/README_ko.md
index 2011ba6..627019b 100644
--- a/.github/README_ko.md
+++ b/.github/README_ko.md
@@ -116,7 +116,7 @@ The `--db` flag accepts `mongo`, `mysql` and `postgres`.
 생성된 프로젝트는 `docker-compose`를 통해 실행 될 수 있습니다.
 ```sh
 cd my-app
-docker-compose up
+docker compose up
 ```
 빌드가 끝나면, 어플리케이션은 http://localhost:8080에서 연결이 
 가능합니다. 
diff --git a/.github/README_pt-br.md b/.github/README_pt-br.md
index 82ff581..ea99620 100644
--- a/.github/README_pt-br.md
+++ b/.github/README_pt-br.md
@@ -140,7 +140,7 @@ O argumento `--db` aceita as opções `mongo`, `mysql` e `postgres`.
 O projeto gerado está pronto para ser executado com `docker-compose`:
 ```sh
 cd my-app
-docker-compose up
+docker compose up
 ```
 
 Após o build ser concluído, a aplicação ficará disponível em 
diff --git a/.github/README_tr.md b/.github/README_tr.md
index 5048a56..8091678 100644
--- a/.github/README_tr.md
+++ b/.github/README_tr.md
@@ -118,7 +118,7 @@ Oluşturulan proje `docker-compose` komutu ile çalıştırmaya hazır olacaktı
 
 ```sh
 cd my-app
-docker-compose up
+docker compose up
 ```
 
 Build tamamlandıktan sonra, uygulama http://localhost:8080 adresinden erişilebilir olacaktır.
diff --git a/.github/README_ua.md b/.github/README_ua.md
index d5de338..b942ad7 100644
--- a/.github/README_ua.md
+++ b/.github/README_ua.md
@@ -120,7 +120,7 @@ go run github.com/shpota/goxygen init --frontend vue --db postgres my-app
 Згенерований проєкт готовий до запуску з `docker-compose`:
 ```sh
 cd my-app
-docker-compose up
+docker compose up
 ```
 Після завершення збірки, застосунок буде доступний на 
 http://localhost:8080.
diff --git a/.github/README_zh.md b/.github/README_zh.md
index 45e927f..ae1f0f1 100644
--- a/.github/README_zh.md
+++ b/.github/README_zh.md
@@ -115,7 +115,7 @@ The `--db` flag accepts `mongo`, `mysql` and `postgres`.
 这个项目已经可以用`docker-compose`来运行了：  
 ```sh
 cd my-app
-docker-compose up
+docker compose up
 ```
 build完成之后，就可以在 http://localhost:8080 查看你的Web项目了。    
 
diff --git a/static/generated.go b/static/generated.go
index cb6293e..9d55926 100644
--- a/static/generated.go
+++ b/static/generated.go
@@ -882,11 +882,9 @@ CMD ./server
 
 ## Environment setup
 
-You need to have [Go](https://golang.org/),
-[Node.js](https://nodejs.org/),
-[Docker](https://www.docker.com/), and
-[Docker Compose](https://docs.docker.com/compose/)
-(comes pre-installed with Docker on Mac and Windows)
+You need to have [Go](https://go.dev/),
+[Node.js](https://nodejs.org/) and
+[Docker](https://www.docker.com/)
 installed on your computer.
 
 Verify the tools by running the following commands:
@@ -895,7 +893,6 @@ Verify the tools by running the following commands:
 go version
 npm --version
 docker --version
-docker-compose --version
 ` + "`" + `` + "`" + `` + "`" + `
 
 If you are using Windows you will also need
@@ -907,7 +904,7 @@ on Mac and almost all Linux distributions.
 In the project directory run the command (you might
 need to prepend it with ` + "`" + `sudo` + "`" + ` depending on your setup):
 ` + "`" + `` + "`" + `` + "`" + `sh
-docker-compose -f docker-compose-dev.yml up
+docker compose -f docker-compose-dev.yml up
 ` + "`" + `` + "`" + `` + "`" + `
 
 This starts a local MongoDB on ` + "`" + `localhost:27017` + "`" + `.
@@ -936,7 +933,7 @@ The application will be available on http://localhost:3000.
 
 Perform:
 ` + "`" + `` + "`" + `` + "`" + `sh
-docker-compose up
+docker compose up
 ` + "`" + `` + "`" + `` + "`" + `
 This will build the application and start it together with
 its database. Access the application on http://localhost:8080.
@@ -1149,11 +1146,9 @@ CMD ./server
 
 ## Environment setup
 
-You need to have [Go](https://golang.org/),
-[Node.js](https://nodejs.org/),
-[Docker](https://www.docker.com/), and
-[Docker Compose](https://docs.docker.com/compose/)
-(comes pre-installed with Docker on Mac and Windows)
+You need to have [Go](https://go.dev/),
+[Node.js](https://nodejs.org/) and
+[Docker](https://www.docker.com/)
 installed on your computer.
 
 Verify the tools by running the following commands:
@@ -1162,7 +1157,6 @@ Verify the tools by running the following commands:
 go version
 npm --version
 docker --version
-docker-compose --version
 ` + "`" + `` + "`" + `` + "`" + `
 
 ## Start in development mode
@@ -1170,7 +1164,7 @@ docker-compose --version
 In the project directory run the command (you might
 need to prepend it with ` + "`" + `sudo` + "`" + ` depending on your setup):
 ` + "`" + `` + "`" + `` + "`" + `sh
-docker-compose -f docker-compose-dev.yml up
+docker compose -f docker-compose-dev.yml up
 ` + "`" + `` + "`" + `` + "`" + `
 
 This starts a local MySQL database on ` + "`" + `localhost:3306` + "`" + `.
@@ -1199,7 +1193,7 @@ The application will be available on http://localhost:3000.
 
 Perform:
 ` + "`" + `` + "`" + `` + "`" + `sh
-docker-compose up
+docker compose up
 ` + "`" + `` + "`" + `` + "`" + `
 This will build the application and start it together with
 its database. Access the application on http://localhost:8080.
@@ -1352,11 +1346,9 @@ CMD ./server
 
 ## Environment setup
 
-You need to have [Go](https://golang.org/),
-[Node.js](https://nodejs.org/),
-[Docker](https://www.docker.com/), and
-[Docker Compose](https://docs.docker.com/compose/)
-(comes pre-installed with Docker on Mac and Windows)
+You need to have [Go](https://go.dev/),
+[Node.js](https://nodejs.org/) and
+[Docker](https://www.docker.com/)
 installed on your computer.
 
 Verify the tools by running the following commands:
@@ -1365,7 +1357,6 @@ Verify the tools by running the following commands:
 go version
 npm --version
 docker --version
-docker-compose --version
 ` + "`" + `` + "`" + `` + "`" + `
 
 ## Start in development mode
@@ -1373,7 +1364,7 @@ docker-compose --version
 In the project directory run the command (you might
 need to prepend it with ` + "`" + `sudo` + "`" + ` depending on your setup):
 ` + "`" + `` + "`" + `` + "`" + `sh
-docker-compose -f docker-compose-dev.yml up
+docker compose -f docker-compose-dev.yml up
 ` + "`" + `` + "`" + `` + "`" + `
 
 This starts a local PostgreSQL database on ` + "`" + `localhost:5432` + "`" + `.
@@ -1402,7 +1393,7 @@ The application will be available on http://localhost:3000.
 
 Perform:
 ` + "`" + `` + "`" + `` + "`" + `sh
-docker-compose up
+docker compose up
 ` + "`" + `` + "`" + `` + "`" + `
 This will build the application and start it together with
 its database. Access the application on http://localhost:8080.
diff --git a/templates/mongo.README.md b/templates/mongo.README.md
index b85d918..abd3ec8 100644
--- a/templates/mongo.README.md
+++ b/templates/mongo.README.md
@@ -2,11 +2,9 @@
 
 ## Environment setup
 
-You need to have [Go](https://golang.org/),
-[Node.js](https://nodejs.org/),
-[Docker](https://www.docker.com/), and
-[Docker Compose](https://docs.docker.com/compose/)
-(comes pre-installed with Docker on Mac and Windows)
+You need to have [Go](https://go.dev/),
+[Node.js](https://nodejs.org/) and
+[Docker](https://www.docker.com/)
 installed on your computer.
 
 Verify the tools by running the following commands:
@@ -15,7 +13,6 @@ Verify the tools by running the following commands:
 go version
 npm --version
 docker --version
-docker-compose --version
 ```
 
 If you are using Windows you will also need
@@ -27,7 +24,7 @@ on Mac and almost all Linux distributions.
 In the project directory run the command (you might
 need to prepend it with `sudo` depending on your setup):
 ```sh
-docker-compose -f docker-compose-dev.yml up
+docker compose -f docker-compose-dev.yml up
 ```
 
 This starts a local MongoDB on `localhost:27017`.
@@ -56,7 +53,7 @@ The application will be available on http://localhost:3000.
 
 Perform:
 ```sh
-docker-compose up
+docker compose up
 ```
 This will build the application and start it together with
 its database. Access the application on http://localhost:8080.
diff --git a/templates/mysql.README.md b/templates/mysql.README.md
index b91d871..b94d670 100644
--- a/templates/mysql.README.md
+++ b/templates/mysql.README.md
@@ -2,11 +2,9 @@
 
 ## Environment setup
 
-You need to have [Go](https://golang.org/),
-[Node.js](https://nodejs.org/),
-[Docker](https://www.docker.com/), and
-[Docker Compose](https://docs.docker.com/compose/)
-(comes pre-installed with Docker on Mac and Windows)
+You need to have [Go](https://go.dev/),
+[Node.js](https://nodejs.org/) and
+[Docker](https://www.docker.com/)
 installed on your computer.
 
 Verify the tools by running the following commands:
@@ -15,7 +13,6 @@ Verify the tools by running the following commands:
 go version
 npm --version
 docker --version
-docker-compose --version
 ```
 
 ## Start in development mode
@@ -23,7 +20,7 @@ docker-compose --version
 In the project directory run the command (you might
 need to prepend it with `sudo` depending on your setup):
 ```sh
-docker-compose -f docker-compose-dev.yml up
+docker compose -f docker-compose-dev.yml up
 ```
 
 This starts a local MySQL database on `localhost:3306`.
@@ -52,7 +49,7 @@ The application will be available on http://localhost:3000.
 
 Perform:
 ```sh
-docker-compose up
+docker compose up
 ```
 This will build the application and start it together with
 its database. Access the application on http://localhost:8080.
diff --git a/templates/postgres.README.md b/templates/postgres.README.md
index b7c98d9..4ed83e4 100644
--- a/templates/postgres.README.md
+++ b/templates/postgres.README.md
@@ -2,11 +2,9 @@
 
 ## Environment setup
 
-You need to have [Go](https://golang.org/),
-[Node.js](https://nodejs.org/),
-[Docker](https://www.docker.com/), and
-[Docker Compose](https://docs.docker.com/compose/)
-(comes pre-installed with Docker on Mac and Windows)
+You need to have [Go](https://go.dev/),
+[Node.js](https://nodejs.org/) and
+[Docker](https://www.docker.com/)
 installed on your computer.
 
 Verify the tools by running the following commands:
@@ -15,7 +13,6 @@ Verify the tools by running the following commands:
 go version
 npm --version
 docker --version
-docker-compose --version
 ```
 
 ## Start in development mode
@@ -23,7 +20,7 @@ docker-compose --version
 In the project directory run the command (you might
 need to prepend it with `sudo` depending on your setup):
 ```sh
-docker-compose -f docker-compose-dev.yml up
+docker compose -f docker-compose-dev.yml up
 ```
 
 This starts a local PostgreSQL database on `localhost:5432`.
@@ -52,7 +49,7 @@ The application will be available on http://localhost:3000.
 
 Perform:
 ```sh
-docker-compose up
+docker compose up
 ```
 This will build the application and start it together with
 its database. Access the application on http://localhost:8080.