diff --git a/make/dev/docker-compose.yml b/make/dev/docker-compose.yml index c25a4d7c8..f99224b92 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 72338c915..10cbada2b 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 1cef91005..487f71e5f 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 f950174ea..253d63014 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: