From 2056ab2f01e117a2f228d3b76a6e1558579a9550 Mon Sep 17 00:00:00 2001 From: Guillaume Lours Date: Thu, 4 Nov 2021 15:51:58 +0100 Subject: [PATCH] Remove version from compose files to conform to the specification (#167) https://github.com/compose-spec/compose-spec/blob/master/spec.md#version-top-level-element Signed-off-by: Guillaume Lours --- 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, 2 insertions(+), 39 deletions(-) diff --git a/angular/README.md b/angular/README.md index 373c14a..230f21a 100644 --- a/angular/README.md +++ b/angular/README.md @@ -14,7 +14,6 @@ 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 d13efd9..ce1eb2f 100644 --- a/angular/docker-compose.yaml +++ b/angular/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.7" services: web: build: angular diff --git a/apache-php/docker-compose.yaml b/apache-php/docker-compose.yaml index abe221f..d4455ce 100644 --- a/apache-php/docker-compose.yaml +++ b/apache-php/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.7" services: web: build: app diff --git a/aspnet-mssql/docker-compose.yaml b/aspnet-mssql/docker-compose.yaml index 402be54..d30f59e 100644 --- a/aspnet-mssql/docker-compose.yaml +++ b/aspnet-mssql/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.7" services: web: build: app/aspnetapp diff --git a/django/docker-compose.yml b/django/docker-compose.yml index 111ba72..17ceafd 100644 --- a/django/docker-compose.yml +++ b/django/docker-compose.yml @@ -1,5 +1,4 @@ -version: '3.7' -services: +services: web: build: app ports: diff --git a/elasticsearch-logstash-kibana/docker-compose.yml b/elasticsearch-logstash-kibana/docker-compose.yml index 560212a..68812ef 100644 --- a/elasticsearch-logstash-kibana/docker-compose.yml +++ b/elasticsearch-logstash-kibana/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: elasticsearch: image: elasticsearch:7.8.0 diff --git a/flask/docker-compose.yaml b/flask/docker-compose.yaml index 8d861ab..830c446 100644 --- a/flask/docker-compose.yaml +++ b/flask/docker-compose.yaml @@ -1,5 +1,4 @@ -version: '3' -services: +services: web: build: app ports: diff --git a/gitea-postgres/docker-compose.yaml b/gitea-postgres/docker-compose.yaml index 90a20d0..955ca49 100644 --- a/gitea-postgres/docker-compose.yaml +++ b/gitea-postgres/docker-compose.yaml @@ -1,4 +1,3 @@ -version: '3.7' services: gitea: image: gitea/gitea:latest diff --git a/minecraft/docker-compose.yml b/minecraft/docker-compose.yml index 7718b9c..1fe1df7 100644 --- a/minecraft/docker-compose.yml +++ b/minecraft/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3.7' services: minecraft: image: itzg/minecraft-server diff --git a/nextcloud-postgres/docker-compose.yaml b/nextcloud-postgres/docker-compose.yaml index 31f7fc3..a72e2fb 100644 --- a/nextcloud-postgres/docker-compose.yaml +++ b/nextcloud-postgres/docker-compose.yaml @@ -1,4 +1,3 @@ -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 8f04e66..674dcc3 100644 --- a/nextcloud-redis-mariadb/docker-compose.yaml +++ b/nextcloud-redis-mariadb/docker-compose.yaml @@ -1,4 +1,3 @@ -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 4190b59..b35855c 100644 --- a/nginx-aspnet-mysql/docker-compose.yaml +++ b/nginx-aspnet-mysql/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.7" services: backend: build: backend diff --git a/nginx-flask-mongo/docker-compose.yaml b/nginx-flask-mongo/docker-compose.yaml index f673c3d..7ac81f0 100644 --- a/nginx-flask-mongo/docker-compose.yaml +++ b/nginx-flask-mongo/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.7" services: web: image: nginx diff --git a/nginx-flask-mysql/docker-compose.yaml b/nginx-flask-mysql/docker-compose.yaml index 50873f9..3752c94 100644 --- a/nginx-flask-mysql/docker-compose.yaml +++ b/nginx-flask-mysql/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.7" services: db: image: mysql:8.0.19 diff --git a/nginx-golang-mysql/docker-compose.yaml b/nginx-golang-mysql/docker-compose.yaml index cb2999f..c58682f 100644 --- a/nginx-golang-mysql/docker-compose.yaml +++ b/nginx-golang-mysql/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.7" services: backend: build: backend diff --git a/nginx-golang-postgres/docker-compose.yaml b/nginx-golang-postgres/docker-compose.yaml index e035aba..12b5593 100644 --- a/nginx-golang-postgres/docker-compose.yaml +++ b/nginx-golang-postgres/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.7" services: backend: build: backend diff --git a/nginx-golang/README.md b/nginx-golang/README.md index 42a3ca4..543a05f 100644 --- a/nginx-golang/README.md +++ b/nginx-golang/README.md @@ -16,7 +16,6 @@ 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 a3d6912..a580242 100644 --- a/nginx-golang/docker-compose.yml +++ b/nginx-golang/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.7" services: frontend: build: frontend diff --git a/nginx-wsgi-flask/docker-compose.yaml b/nginx-wsgi-flask/docker-compose.yaml index 00a4c56..d637c95 100644 --- a/nginx-wsgi-flask/docker-compose.yaml +++ b/nginx-wsgi-flask/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.7" services: nginx-proxy: build: nginx diff --git a/prometheus-grafana/README.md b/prometheus-grafana/README.md index c64e431..7e1e11f 100644 --- a/prometheus-grafana/README.md +++ b/prometheus-grafana/README.md @@ -14,7 +14,6 @@ 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 bd6bf86..24369bc 100644 --- a/prometheus-grafana/docker-compose.yml +++ b/prometheus-grafana/docker-compose.yml @@ -1,4 +1,3 @@ -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 ba9610e..652294e 100644 --- a/react-express-mongodb/docker-compose.yml +++ b/react-express-mongodb/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.7" services: frontend: build: frontend diff --git a/react-express-mysql/docker-compose.yaml b/react-express-mysql/docker-compose.yaml index 29a149c..3f9c6e8 100644 --- a/react-express-mysql/docker-compose.yaml +++ b/react-express-mysql/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.7" services: backend: build: diff --git a/react-java-mysql/docker-compose.yaml b/react-java-mysql/docker-compose.yaml index 6d57d49..539fa3a 100644 --- a/react-java-mysql/docker-compose.yaml +++ b/react-java-mysql/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.7" services: backend: build: backend diff --git a/react-rust-postgres/docker-compose.yaml b/react-rust-postgres/docker-compose.yaml index d40cb71..9ff8c99 100644 --- a/react-rust-postgres/docker-compose.yaml +++ b/react-rust-postgres/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.7" services: frontend: build: diff --git a/sparkjava-mysql/README.md b/sparkjava-mysql/README.md index 65ab1d4..e3220e8 100644 --- a/sparkjava-mysql/README.md +++ b/sparkjava-mysql/README.md @@ -16,7 +16,6 @@ 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 9e5f32d..ebb2161 100644 --- a/sparkjava-mysql/docker-compose.yaml +++ b/sparkjava-mysql/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.7" services: backend: build: backend diff --git a/sparkjava/README.md b/sparkjava/README.md index f5ec924..2f2f469 100644 --- a/sparkjava/README.md +++ b/sparkjava/README.md @@ -13,7 +13,6 @@ 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 974ff61..55482c2 100644 --- a/sparkjava/docker-compose.yaml +++ b/sparkjava/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.7" services: sparkjava: build: sparkjava diff --git a/spring-postgres/README.md b/spring-postgres/README.md index 80f2d53..a59a5fd 100644 --- a/spring-postgres/README.md +++ b/spring-postgres/README.md @@ -16,7 +16,6 @@ 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 ac5b44a..6d98f75 100644 --- a/spring-postgres/docker-compose.yaml +++ b/spring-postgres/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.7" services: backend: build: backend diff --git a/traefik-golang/README.md b/traefik-golang/README.md index 1d3c678..f1c287e 100644 --- a/traefik-golang/README.md +++ b/traefik-golang/README.md @@ -13,7 +13,6 @@ 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 1032869..f4fb961 100644 --- a/traefik-golang/docker-compose.yml +++ b/traefik-golang/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.7" services: frontend: image: traefik:2.2 diff --git a/vuejs/README.md b/vuejs/README.md index f1134bf..0ed5d30 100644 --- a/vuejs/README.md +++ b/vuejs/README.md @@ -13,7 +13,6 @@ 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 947e6f5..e7dbb11 100644 --- a/vuejs/docker-compose.yaml +++ b/vuejs/docker-compose.yaml @@ -1,4 +1,3 @@ -version: "3.7" services: web: build: vuejs diff --git a/wordpress-mysql/docker-compose.yaml b/wordpress-mysql/docker-compose.yaml index 9549e04..4675938 100644 --- a/wordpress-mysql/docker-compose.yaml +++ b/wordpress-mysql/docker-compose.yaml @@ -1,4 +1,3 @@ -version: '3.7' services: db: image: mysql:8.0.19