From 09401ff1012cb488f70715ca6d8e72f92dcc12b0 Mon Sep 17 00:00:00 2001
From: Guillaume Lours <guillaume.lours@docker.com>
Date: Fri, 14 Aug 2020 22:05:23 +0200
Subject: [PATCH] Remove version from compose files to work with the 1.27.x
versionless Compose binary
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
---
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.yml | 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-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/docker-compose.yml | 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/docker-compose.yaml | 1 -
sparkjava/docker-compose.yaml | 1 -
spring-postgres/docker-compose.yaml | 1 -
traefik-golang/docker-compose.yml | 1 -
vuejs/docker-compose.yaml | 1 -
wordpress-mysql/docker-compose.yaml | 1 -
26 files changed, 2 insertions(+), 29 deletions(-)
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 cfb9702..7f39ada 100644
--- a/aspnet-mssql/docker-compose.yaml
+++ b/aspnet-mssql/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: "3.7"
services:
web:
build: app
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.yml b/flask/docker-compose.yml
index 8d861ab..830c446 100644
--- a/flask/docker-compose.yml
+++ b/flask/docker-compose.yml
@@ -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 56ff0a3..1f3e19c 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 e2b09e2..b63f473 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 7470b59..48ce85a 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-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 3b406ed..5282575 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 9423a67..fd5a558 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 bd5dd42..7a1f9b1 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/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/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 1056cf1..c19fa28 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 b1998a4..c57e024 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 263ed2b..ebf4cef 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/docker-compose.yaml b/sparkjava-mysql/docker-compose.yaml
index 3cdef5c..44fdc66 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/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/docker-compose.yaml b/spring-postgres/docker-compose.yaml
index 9595e59..9d51d0f 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/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/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 5fddc1a..eb7ca1a 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