diff --git a/server/build/docker-compose-generator/main.go b/server/build/docker-compose-generator/main.go index c6fb322076..bb14487f6c 100644 --- a/server/build/docker-compose-generator/main.go +++ b/server/build/docker-compose-generator/main.go @@ -12,7 +12,6 @@ import ( ) type DockerCompose struct { - Version string `yaml:"version"` Services map[string]*Container `yaml:"services"` } @@ -51,7 +50,6 @@ func main() { } var dockerCompose DockerCompose - dockerCompose.Version = "2.4" dockerCompose.Services = map[string]*Container{} dockerCompose.Services["start_dependencies"] = &Container{ Image: "mattermost/mattermost-wait-for-dep:latest", diff --git a/server/build/docker-compose.common.yml b/server/build/docker-compose.common.yml index 10e40cd8f1..e1f99a319b 100644 --- a/server/build/docker-compose.common.yml +++ b/server/build/docker-compose.common.yml @@ -1,4 +1,3 @@ -version: '2.4' services: mysql: image: "mysql/mysql-server:8.0.32" diff --git a/server/build/docker-compose.yml b/server/build/docker-compose.yml index 06ca476104..79a58d02a2 100644 --- a/server/build/docker-compose.yml +++ b/server/build/docker-compose.yml @@ -1,4 +1,3 @@ -version: '2.4' services: mysql: extends: diff --git a/server/docker-compose.makefile.m1.yml b/server/docker-compose.makefile.m1.yml index 739def7dbe..9d1a646990 100644 --- a/server/docker-compose.makefile.m1.yml +++ b/server/docker-compose.makefile.m1.yml @@ -1,4 +1,3 @@ -version: '2.4' services: elasticsearch: image: "mattermostdevelopment/mattermost-elasticsearch:8.9.0" diff --git a/server/docker-compose.makefile.yml b/server/docker-compose.makefile.yml index 4bda77d02c..5084117bea 100644 --- a/server/docker-compose.makefile.yml +++ b/server/docker-compose.makefile.yml @@ -1,4 +1,3 @@ -version: '2.4' services: mysql: restart: 'no' diff --git a/server/docker-compose.yaml b/server/docker-compose.yaml index a4c8654c35..9845ec1232 100644 --- a/server/docker-compose.yaml +++ b/server/docker-compose.yaml @@ -1,4 +1,3 @@ -version: '2.4' services: mysql: container_name: mattermost-mysql