From 5accf6af0ecfdc438cc73c3d1c7166a2f9bfd88b Mon Sep 17 00:00:00 2001 From: Jon Maj Date: Sun, 28 Nov 2021 23:56:37 +0100 Subject: [PATCH] Revert "Remove version from compose files to conform to the specification (#167)" This reverts commit 2056ab2f01e117a2f228d3b76a6e1558579a9550. --- angular/README.md | 1 + angular/docker-compose.yaml | 1 + apache-php/docker-compose.yaml | 1 + aspnet-mssql/docker-compose.yaml | 1 + django/docker-compose.yml | 3 ++- elasticsearch-logstash-kibana/docker-compose.yml | 2 ++ flask/docker-compose.yaml | 3 ++- gitea-postgres/docker-compose.yaml | 1 + minecraft/docker-compose.yml | 1 + nextcloud-postgres/docker-compose.yaml | 1 + nextcloud-redis-mariadb/docker-compose.yaml | 1 + nginx-aspnet-mysql/docker-compose.yaml | 1 + nginx-flask-mongo/docker-compose.yaml | 1 + nginx-flask-mysql/docker-compose.yaml | 1 + nginx-golang-mysql/docker-compose.yaml | 1 + nginx-golang-postgres/docker-compose.yaml | 1 + nginx-golang/README.md | 1 + nginx-golang/docker-compose.yml | 1 + nginx-wsgi-flask/docker-compose.yaml | 1 + prometheus-grafana/README.md | 1 + prometheus-grafana/docker-compose.yml | 1 + react-express-mongodb/docker-compose.yml | 1 + react-express-mysql/docker-compose.yaml | 1 + react-java-mysql/docker-compose.yaml | 1 + react-rust-postgres/docker-compose.yaml | 1 + sparkjava-mysql/README.md | 1 + sparkjava-mysql/docker-compose.yaml | 1 + sparkjava/README.md | 1 + sparkjava/docker-compose.yaml | 1 + spring-postgres/README.md | 1 + spring-postgres/docker-compose.yaml | 1 + traefik-golang/README.md | 1 + traefik-golang/docker-compose.yml | 1 + vuejs/README.md | 1 + vuejs/docker-compose.yaml | 1 + wordpress-mysql/docker-compose.yaml | 1 + 36 files changed, 39 insertions(+), 2 deletions(-) diff --git a/angular/README.md b/angular/README.md index d501419..de312f4 100644 --- a/angular/README.md +++ b/angular/README.md @@ -14,6 +14,7 @@ Project structure: [_docker-compose.yaml_](docker-compose.yaml) ``` +version: "3.7" services: web: build: angular diff --git a/angular/docker-compose.yaml b/angular/docker-compose.yaml index ce1eb2f..d13efd9 100644 --- a/angular/docker-compose.yaml +++ b/angular/docker-compose.yaml @@ -1,3 +1,4 @@ +version: "3.7" services: web: build: angular diff --git a/apache-php/docker-compose.yaml b/apache-php/docker-compose.yaml index d4455ce..abe221f 100644 --- a/apache-php/docker-compose.yaml +++ b/apache-php/docker-compose.yaml @@ -1,3 +1,4 @@ +version: "3.7" services: web: build: app diff --git a/aspnet-mssql/docker-compose.yaml b/aspnet-mssql/docker-compose.yaml index 3fe4acd..bdabee2 100644 --- a/aspnet-mssql/docker-compose.yaml +++ b/aspnet-mssql/docker-compose.yaml @@ -1,3 +1,4 @@ +version: "3.7" services: web: build: app/aspnetapp diff --git a/django/docker-compose.yml b/django/docker-compose.yml index 17ceafd..111ba72 100644 --- a/django/docker-compose.yml +++ b/django/docker-compose.yml @@ -1,4 +1,5 @@ -services: +version: '3.7' +services: web: build: app ports: diff --git a/elasticsearch-logstash-kibana/docker-compose.yml b/elasticsearch-logstash-kibana/docker-compose.yml index 46e6e0b..839b611 100644 --- a/elasticsearch-logstash-kibana/docker-compose.yml +++ b/elasticsearch-logstash-kibana/docker-compose.yml @@ -1,3 +1,5 @@ +version: '3.8' + services: elasticsearch: image: elasticsearch:7.14.2 diff --git a/flask/docker-compose.yaml b/flask/docker-compose.yaml index 830c446..8d861ab 100644 --- a/flask/docker-compose.yaml +++ b/flask/docker-compose.yaml @@ -1,4 +1,5 @@ -services: +version: '3' +services: web: build: app ports: diff --git a/gitea-postgres/docker-compose.yaml b/gitea-postgres/docker-compose.yaml index 955ca49..90a20d0 100644 --- a/gitea-postgres/docker-compose.yaml +++ b/gitea-postgres/docker-compose.yaml @@ -1,3 +1,4 @@ +version: '3.7' services: gitea: image: gitea/gitea:latest diff --git a/minecraft/docker-compose.yml b/minecraft/docker-compose.yml index 1fe1df7..7718b9c 100644 --- a/minecraft/docker-compose.yml +++ b/minecraft/docker-compose.yml @@ -1,3 +1,4 @@ +version: '3.7' services: minecraft: image: itzg/minecraft-server diff --git a/nextcloud-postgres/docker-compose.yaml b/nextcloud-postgres/docker-compose.yaml index a72e2fb..31f7fc3 100644 --- a/nextcloud-postgres/docker-compose.yaml +++ b/nextcloud-postgres/docker-compose.yaml @@ -1,3 +1,4 @@ +version: '3.7' services: nc: image: nextcloud:apache diff --git a/nextcloud-redis-mariadb/docker-compose.yaml b/nextcloud-redis-mariadb/docker-compose.yaml index 674dcc3..8f04e66 100644 --- a/nextcloud-redis-mariadb/docker-compose.yaml +++ b/nextcloud-redis-mariadb/docker-compose.yaml @@ -1,3 +1,4 @@ +version: '3.7' services: nc: image: nextcloud:apache diff --git a/nginx-aspnet-mysql/docker-compose.yaml b/nginx-aspnet-mysql/docker-compose.yaml index 9e810d1..ed4c8d0 100644 --- a/nginx-aspnet-mysql/docker-compose.yaml +++ b/nginx-aspnet-mysql/docker-compose.yaml @@ -1,3 +1,4 @@ +version: "3.7" services: backend: build: backend diff --git a/nginx-flask-mongo/docker-compose.yaml b/nginx-flask-mongo/docker-compose.yaml index 7ac81f0..f673c3d 100644 --- a/nginx-flask-mongo/docker-compose.yaml +++ b/nginx-flask-mongo/docker-compose.yaml @@ -1,3 +1,4 @@ +version: "3.7" services: web: image: nginx diff --git a/nginx-flask-mysql/docker-compose.yaml b/nginx-flask-mysql/docker-compose.yaml index a221206..09210ef 100644 --- a/nginx-flask-mysql/docker-compose.yaml +++ b/nginx-flask-mysql/docker-compose.yaml @@ -1,3 +1,4 @@ +version: "3.7" services: db: # We use a mariadb image which supports both amd64 & arm64 architecture diff --git a/nginx-golang-mysql/docker-compose.yaml b/nginx-golang-mysql/docker-compose.yaml index 9568b84..aff0cae 100644 --- a/nginx-golang-mysql/docker-compose.yaml +++ b/nginx-golang-mysql/docker-compose.yaml @@ -1,3 +1,4 @@ +version: "3.7" services: backend: build: backend diff --git a/nginx-golang-postgres/docker-compose.yaml b/nginx-golang-postgres/docker-compose.yaml index 12b5593..e035aba 100644 --- a/nginx-golang-postgres/docker-compose.yaml +++ b/nginx-golang-postgres/docker-compose.yaml @@ -1,3 +1,4 @@ +version: "3.7" services: backend: build: backend diff --git a/nginx-golang/README.md b/nginx-golang/README.md index 543a05f..42a3ca4 100644 --- a/nginx-golang/README.md +++ b/nginx-golang/README.md @@ -16,6 +16,7 @@ Project structure: [_docker-compose.yaml_](docker-compose.yaml) ``` +version: "3.7" services: frontend: build: frontend diff --git a/nginx-golang/docker-compose.yml b/nginx-golang/docker-compose.yml index a580242..a3d6912 100644 --- a/nginx-golang/docker-compose.yml +++ b/nginx-golang/docker-compose.yml @@ -1,3 +1,4 @@ +version: "3.7" services: frontend: build: frontend diff --git a/nginx-wsgi-flask/docker-compose.yaml b/nginx-wsgi-flask/docker-compose.yaml index d637c95..00a4c56 100644 --- a/nginx-wsgi-flask/docker-compose.yaml +++ b/nginx-wsgi-flask/docker-compose.yaml @@ -1,3 +1,4 @@ +version: "3.7" services: nginx-proxy: build: nginx diff --git a/prometheus-grafana/README.md b/prometheus-grafana/README.md index 7e1e11f..c64e431 100644 --- a/prometheus-grafana/README.md +++ b/prometheus-grafana/README.md @@ -14,6 +14,7 @@ Project structure: [_docker-compose.yml_](docker-compose.yml) ``` +version: "3.7" services: prometheus: image: prom/prometheus diff --git a/prometheus-grafana/docker-compose.yml b/prometheus-grafana/docker-compose.yml index 24369bc..bd6bf86 100644 --- a/prometheus-grafana/docker-compose.yml +++ b/prometheus-grafana/docker-compose.yml @@ -1,3 +1,4 @@ +version: "3.7" services: prometheus: image: prom/prometheus diff --git a/react-express-mongodb/docker-compose.yml b/react-express-mongodb/docker-compose.yml index 652294e..ba9610e 100644 --- a/react-express-mongodb/docker-compose.yml +++ b/react-express-mongodb/docker-compose.yml @@ -1,3 +1,4 @@ +version: "3.7" services: frontend: build: frontend diff --git a/react-express-mysql/docker-compose.yaml b/react-express-mysql/docker-compose.yaml index 7a1e710..7911cd9 100644 --- a/react-express-mysql/docker-compose.yaml +++ b/react-express-mysql/docker-compose.yaml @@ -1,3 +1,4 @@ +version: "3.7" services: backend: build: diff --git a/react-java-mysql/docker-compose.yaml b/react-java-mysql/docker-compose.yaml index 19f4c48..cb4dece 100644 --- a/react-java-mysql/docker-compose.yaml +++ b/react-java-mysql/docker-compose.yaml @@ -1,3 +1,4 @@ +version: "3.7" services: backend: build: backend diff --git a/react-rust-postgres/docker-compose.yaml b/react-rust-postgres/docker-compose.yaml index 9ff8c99..d40cb71 100644 --- a/react-rust-postgres/docker-compose.yaml +++ b/react-rust-postgres/docker-compose.yaml @@ -1,3 +1,4 @@ +version: "3.7" services: frontend: build: diff --git a/sparkjava-mysql/README.md b/sparkjava-mysql/README.md index 945377f..b08043a 100644 --- a/sparkjava-mysql/README.md +++ b/sparkjava-mysql/README.md @@ -16,6 +16,7 @@ Project structure: [_docker-compose.yaml_](docker-compose.yaml) ``` +version: "3.7" services: backend: build: backend diff --git a/sparkjava-mysql/docker-compose.yaml b/sparkjava-mysql/docker-compose.yaml index 54f7e98..dfb4d0a 100644 --- a/sparkjava-mysql/docker-compose.yaml +++ b/sparkjava-mysql/docker-compose.yaml @@ -1,3 +1,4 @@ +version: "3.7" services: backend: build: backend diff --git a/sparkjava/README.md b/sparkjava/README.md index 2f2f469..f5ec924 100644 --- a/sparkjava/README.md +++ b/sparkjava/README.md @@ -13,6 +13,7 @@ Project structure: [_docker-compose.yaml_](docker-compose.yaml) ``` +version: "3.7" services: sparkjava: build: sparkjava diff --git a/sparkjava/docker-compose.yaml b/sparkjava/docker-compose.yaml index 55482c2..974ff61 100644 --- a/sparkjava/docker-compose.yaml +++ b/sparkjava/docker-compose.yaml @@ -1,3 +1,4 @@ +version: "3.7" services: sparkjava: build: sparkjava diff --git a/spring-postgres/README.md b/spring-postgres/README.md index a59a5fd..80f2d53 100644 --- a/spring-postgres/README.md +++ b/spring-postgres/README.md @@ -16,6 +16,7 @@ Project structure: [_docker-compose.yaml_](docker-compose.yaml) ``` +version: "3.7" services: backend: build: backend diff --git a/spring-postgres/docker-compose.yaml b/spring-postgres/docker-compose.yaml index 6d98f75..ac5b44a 100644 --- a/spring-postgres/docker-compose.yaml +++ b/spring-postgres/docker-compose.yaml @@ -1,3 +1,4 @@ +version: "3.7" services: backend: build: backend diff --git a/traefik-golang/README.md b/traefik-golang/README.md index f1c287e..1d3c678 100644 --- a/traefik-golang/README.md +++ b/traefik-golang/README.md @@ -13,6 +13,7 @@ Project structure: [_docker-compose.yaml_](docker-compose.yaml) ``` +version: "3.7" services: frontend: image: traefik:2.2 diff --git a/traefik-golang/docker-compose.yml b/traefik-golang/docker-compose.yml index f4fb961..1032869 100644 --- a/traefik-golang/docker-compose.yml +++ b/traefik-golang/docker-compose.yml @@ -1,3 +1,4 @@ +version: "3.7" services: frontend: image: traefik:2.2 diff --git a/vuejs/README.md b/vuejs/README.md index c336103..439718d 100644 --- a/vuejs/README.md +++ b/vuejs/README.md @@ -13,6 +13,7 @@ Project structure: [_docker-compose.yaml_](docker-compose.yaml) ``` +version: "3.7" services: web: build: vuejs diff --git a/vuejs/docker-compose.yaml b/vuejs/docker-compose.yaml index e7dbb11..947e6f5 100644 --- a/vuejs/docker-compose.yaml +++ b/vuejs/docker-compose.yaml @@ -1,3 +1,4 @@ +version: "3.7" services: web: build: vuejs diff --git a/wordpress-mysql/docker-compose.yaml b/wordpress-mysql/docker-compose.yaml index afa0f46..1908b9e 100644 --- a/wordpress-mysql/docker-compose.yaml +++ b/wordpress-mysql/docker-compose.yaml @@ -1,3 +1,4 @@ +version: '3.7' services: db: # We use a mariadb image which supports both amd64 & arm64 architecture