From f44ff2e4c3fcffe688341d767f615f09632f3ae9 Mon Sep 17 00:00:00 2001
From: wang yan <wangyan@vmware.com>
Date: Wed, 17 Oct 2018 16:11:21 +0800
Subject: [PATCH] Remove the env GODEBUG=netdns=cgo

This env is the workaroud of dns resolver on golang 1.7.3.
Remove it is bacause of harbor is using golang 1.9.2, the bug
has already been fixed.

Signed-off-by: wang yan <wangyan@vmware.com>
---
 make/common/templates/adminserver/env | 1 -
 make/common/templates/core/env        | 1 -
 make/common/templates/jobservice/env  | 1 -
 make/docker-compose.tpl               | 4 ----
 tests/docker-compose.test.yml         | 2 --
 5 files changed, 9 deletions(-)

diff --git a/make/common/templates/adminserver/env b/make/common/templates/adminserver/env
index 96a46d3e8..6b04d59a6 100644
--- a/make/common/templates/adminserver/env
+++ b/make/common/templates/adminserver/env
@@ -40,7 +40,6 @@ CORE_SECRET=$core_secret
 JOBSERVICE_SECRET=$jobservice_secret
 TOKEN_EXPIRATION=$token_expiration
 CFG_EXPIRATION=5
-GODEBUG=netdns=cgo
 ADMIRAL_URL=$admiral_url
 WITH_NOTARY=$with_notary
 WITH_CLAIR=$with_clair
diff --git a/make/common/templates/core/env b/make/common/templates/core/env
index 3402c5014..8cc74521f 100644
--- a/make/common/templates/core/env
+++ b/make/common/templates/core/env
@@ -2,7 +2,6 @@ LOG_LEVEL=info
 CONFIG_PATH=/etc/core/app.conf
 CORE_SECRET=$core_secret
 JOBSERVICE_SECRET=$jobservice_secret
-GODEBUG=netdns=cgo
 ADMINSERVER_URL=$adminserver_url
 UAA_CA_ROOT=/etc/core/certificates/uaa_ca.pem
 _REDIS_URL=$redis_host:$redis_port,100,$redis_password
diff --git a/make/common/templates/jobservice/env b/make/common/templates/jobservice/env
index 222eeb813..c4808aea3 100644
--- a/make/common/templates/jobservice/env
+++ b/make/common/templates/jobservice/env
@@ -1,4 +1,3 @@
 CORE_SECRET=$core_secret
 JOBSERVICE_SECRET=$jobservice_secret
 CORE_URL=$core_url
-GODEBUG=netdns=cgo
diff --git a/make/docker-compose.tpl b/make/docker-compose.tpl
index bccd8249e..881c0f2b7 100644
--- a/make/docker-compose.tpl
+++ b/make/docker-compose.tpl
@@ -22,8 +22,6 @@ services:
     networks:
       - harbor
     dns_search: .
-    environment:
-      - GODEBUG=netdns=cgo
     depends_on:
       - log
     logging:
@@ -44,8 +42,6 @@ services:
     networks:
       - harbor
     dns_search: .
-    environment:
-      - GODEBUG=netdns=cgo
     depends_on:
       - log
     logging:
diff --git a/tests/docker-compose.test.yml b/tests/docker-compose.test.yml
index 436a03fd1..566ba0637 100644
--- a/tests/docker-compose.test.yml
+++ b/tests/docker-compose.test.yml
@@ -6,8 +6,6 @@ services:
     volumes:
       - /data/registry:/storage
       - ./common/config/registry/:/etc/registry/
-    environment:
-      - GODEBUG=netdns=cgo
     ports:
       - 5000:5000
     command: