From 690443340b62cda81a58d8905b8bc3423d204451 Mon Sep 17 00:00:00 2001
From: "tomer.banin" <tomer.banin@themarker.com>
Date: Mon, 8 Apr 2019 13:46:14 +0300
Subject: [PATCH 1/3] Add docker files

---
 docker-compose-prod.yml | 13 +++++++++++++
 docker-compose.yml      | 10 ++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 docker-compose-prod.yml
 create mode 100644 docker-compose.yml

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
new file mode 100644
index 0000000..c8e03cb
--- /dev/null
+++ b/docker-compose-prod.yml
@@ -0,0 +1,13 @@
+version: "3.4"
+
+services:
+  ip2country:
+    image: "nexus-ng.themarker.com/ip2country:${version:-latest}"
+    hostname: ip2counrty
+    networks:
+      - production
+    ports:
+      - "4005:4005"
+networks:
+  production:
+    external: true
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..c744289
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,10 @@
+version: "3.4"
+services:
+  ip2country:
+    build: .
+    deploy:
+      mode: replicated
+      replicas: 1
+    image: "nexus-ng.themarker.com/ip2country:${version:-latest}"
+    ports:
+      - "4005:4005"

From c7cb2153f02b43636de76de16b39b0b6a79685c4 Mon Sep 17 00:00:00 2001
From: "tomer.banin" <tomer.banin@themarker.com>
Date: Mon, 8 Apr 2019 14:12:56 +0300
Subject: [PATCH 2/3] Add docker files

---
 docker-compose-prod.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index c8e03cb..1193c41 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -7,7 +7,7 @@ services:
     networks:
       - production
     ports:
-      - "4005:4005"
+      - "4005:8080"
 networks:
   production:
     external: true

From 3d5c5e6a94bb074b2cb38aa3f0e0473f35839034 Mon Sep 17 00:00:00 2001
From: sankemax <sankeman2004@gmail.com>
Date: Thu, 11 Apr 2019 17:16:29 +0300
Subject: [PATCH 3/3] add city

---
 Dockerfile    | 2 +-
 ip2country.go | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bfac340..21a6334 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM golang:1.8
 WORKDIR /go/src/app
-COPY GeoIP2-Country.mmdb /go/src/app
+COPY GeoLite2-City.mmdb /go/src/app
 COPY ip2country.go /go/src/app
 
 RUN go get -d -v github.com/oschwald/geoip2-golang
diff --git a/ip2country.go b/ip2country.go
index c8ecfc1..97e3292 100644
--- a/ip2country.go
+++ b/ip2country.go
@@ -12,7 +12,7 @@ import (
 	geoip2 "github.com/oschwald/geoip2-golang"
 )
 
-var dbFile = "GeoIP2-Country.mmdb"
+var dbFile = "GeoLite2-City.mmdb"
 
 func handler(w http.ResponseWriter, r *http.Request) {
 	db, err := geoip2.Open(dbFile)
@@ -39,6 +39,7 @@ func handler(w http.ResponseWriter, r *http.Request) {
 	resp := make(map[string]string, 2)
 	resp["country"] = record.Country.Names["en"]
 	resp["code"] = record.Country.IsoCode
+	resp["city"] = record.City.Names["en"]
 	w.Header().Set("Content-Type", "application/json")
 	json.NewEncoder(w).Encode(resp)
 }
@@ -57,3 +58,4 @@ func errorHandler(w http.ResponseWriter, r *http.Request, status int, msg string
 		fmt.Fprint(w, msg)
 	}
 }
+