From e60fd0530f37ee51895a05c325d305e091c24912 Mon Sep 17 00:00:00 2001
From: Wenkai Yin <yinw@vmware.com>
Date: Fri, 7 Apr 2017 09:14:41 +0800
Subject: [PATCH] mount config to another dir, fix #1939

---
 make/dev/docker-compose.yml            | 2 +-
 make/docker-compose.tpl                | 6 +++---
 src/adminserver/systemcfg/systemcfg.go | 2 +-
 tests/docker-compose.test.yml          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/make/dev/docker-compose.yml b/make/dev/docker-compose.yml
index c25a4d7c84..f99224b921 100644
--- a/make/dev/docker-compose.yml
+++ b/make/dev/docker-compose.yml
@@ -48,7 +48,7 @@ services:
       - ../common/config/adminserver/env
     restart: always
     volumes:
-      - /data/config/:/etc/adminserver/
+      - /data/config/:/etc/adminserver/config/
       - /data/secretkey:/etc/adminserver/key
       - /data/:/data/
     depends_on:
diff --git a/make/docker-compose.tpl b/make/docker-compose.tpl
index 72338c915c..10cbada2ba 100644
--- a/make/docker-compose.tpl
+++ b/make/docker-compose.tpl
@@ -54,9 +54,9 @@ services:
       - ./common/config/adminserver/env
     restart: always
     volumes:
-      - /data/config/:/etc/adminserver/
-      - /data/secretkey:/etc/adminserver/key
-      - /data/:/data/
+      - /data/config/:/etc/adminserver/config/:z
+      - /data/secretkey:/etc/adminserver/key:z
+      - /data/:/data/:z
     networks:
       - harbor
     depends_on:
diff --git a/src/adminserver/systemcfg/systemcfg.go b/src/adminserver/systemcfg/systemcfg.go
index 1cef910054..487f71e5f9 100644
--- a/src/adminserver/systemcfg/systemcfg.go
+++ b/src/adminserver/systemcfg/systemcfg.go
@@ -31,7 +31,7 @@ import (
 )
 
 const (
-	defaultJSONCfgStorePath string = "/etc/adminserver/config.json"
+	defaultJSONCfgStorePath string = "/etc/adminserver/config/config.json"
 	defaultKeyPath          string = "/etc/adminserver/key"
 )
 
diff --git a/tests/docker-compose.test.yml b/tests/docker-compose.test.yml
index f950174ea7..253d63014c 100644
--- a/tests/docker-compose.test.yml
+++ b/tests/docker-compose.test.yml
@@ -29,7 +29,7 @@ services:
       - ./common/config/adminserver/env
     restart: always
     volumes:
-      - /data/config/:/etc/adminserver/
+      - /data/config/:/etc/adminserver/config/
       - /data/secretkey:/etc/adminserver/key
       - /data/:/data/
     ports: