From abf9814bc19b9cd2fdaa4a36ff2ee887b15f5a32 Mon Sep 17 00:00:00 2001
From: abdullahrkw <abdullah.nawazrkw@gmail.com>
Date: Mon, 28 Sep 2020 19:13:22 +0500
Subject: [PATCH] Dockercompose version update 2.3 --> 3.3 (#2235)

* updating dockercompose from 2.3 to 3.3

* adding changelog

* updating version in ci

* updating network mode docker-compose.ci

* updating version in components/serverless/docker-compose
---
 CHANGELOG.md                                        | 1 +
 components/analytics/docker-compose.analytics.yml   | 2 +-
 components/serverless/docker-compose.serverless.yml | 2 +-
 docker-compose.ci.yml                               | 4 ++--
 docker-compose.yml                                  | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b63377c..c8ed324a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ filters and searching the nearest frame without any annotations (<https://github
 - Right colors of label tags in label mapping when a user runs automatic detection (<https://github.com/openvinotoolkit/cvat/pull/2162>)
 - Nuclio became an optional component of CVAT (<https://github.com/openvinotoolkit/cvat/pull/2192>)
 - A key to remove a point from a polyshape [Ctrl => Alt] (<https://github.com/openvinotoolkit/cvat/pull/2204>)
+- Updated `docker-compose` file version from `2.3` to `3.3`
 
 ### Deprecated
 -
diff --git a/components/analytics/docker-compose.analytics.yml b/components/analytics/docker-compose.analytics.yml
index b097b087..4c76e222 100644
--- a/components/analytics/docker-compose.analytics.yml
+++ b/components/analytics/docker-compose.analytics.yml
@@ -1,4 +1,4 @@
-version: '2.3'
+version: '3.3'
 services:
   cvat_elasticsearch:
     container_name: cvat_elasticsearch
diff --git a/components/serverless/docker-compose.serverless.yml b/components/serverless/docker-compose.serverless.yml
index 7663785b..a0aabf7f 100644
--- a/components/serverless/docker-compose.serverless.yml
+++ b/components/serverless/docker-compose.serverless.yml
@@ -1,4 +1,4 @@
-version: '2.3'
+version: '3.3'
 services:
   serverless:
     container_name: nuclio
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
index 76f0804a..646a9c2d 100644
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -1,10 +1,10 @@
-version: "2.3"
+version: "3.3"
 
 services:
   cvat_ci:
     image: cvat_ci
+    network_mode: host
     build:
-      network: host
       context: .
       dockerfile: Dockerfile.ci
     depends_on:
diff --git a/docker-compose.yml b/docker-compose.yml
index 9a8afab1..4838cf78 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: MIT
 #
-version: "2.3"
+version: "3.3"
 
 services:
   cvat_db:
@@ -98,9 +98,9 @@ services:
 networks:
   default:
     ipam:
+      driver: default
       config:
         - subnet: 172.28.0.0/24
-          gateway: 172.28.0.1
 
 volumes:
   cvat_db: