Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-16 20:01:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1948 from ywk253100/170406_secretkey

Browse Source 
Mount config to another dir, fix #1939
This commit is contained in:
Daniel Jiang 2017-04-07 11:35:58 +08:00 committed by GitHub
commit 93f5c78b4b
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/dev/docker-compose.yml
View File

@ -48,7 +48,7 @@ services:
- ../common/config/adminserver/env - ../common/config/adminserver/env
restart: always restart: always
volumes: volumes:
- /data/config/:/etc/adminserver/ - /data/config/:/etc/adminserver/config/
- /data/secretkey:/etc/adminserver/key - /data/secretkey:/etc/adminserver/key
- /data/:/data/ - /data/:/data/
depends_on: depends_on:

6
make/docker-compose.tpl
View File

@ -54,9 +54,9 @@ services:
- ./common/config/adminserver/env - ./common/config/adminserver/env
restart: always restart: always
volumes: volumes:
- /data/config/:/etc/adminserver/ - /data/config/:/etc/adminserver/config/:z
- /data/secretkey:/etc/adminserver/key - /data/secretkey:/etc/adminserver/key:z
- /data/:/data/ - /data/:/data/:z
networks: networks:
- harbor - harbor
depends_on: depends_on:

2
src/adminserver/systemcfg/systemcfg.go
View File

@ -31,7 +31,7 @@ import (
) )
const ( const (
defaultJSONCfgStorePath string = "/etc/adminserver/config.json" defaultJSONCfgStorePath string = "/etc/adminserver/config/config.json"
defaultKeyPath string = "/etc/adminserver/key" defaultKeyPath string = "/etc/adminserver/key"
) )

2
tests/docker-compose.test.yml
View File

@ -29,7 +29,7 @@ services:
- ./common/config/adminserver/env - ./common/config/adminserver/env
restart: always restart: always
volumes: volumes:
- /data/config/:/etc/adminserver/ - /data/config/:/etc/adminserver/config/
- /data/secretkey:/etc/adminserver/key - /data/secretkey:/etc/adminserver/key
- /data/:/data/ - /data/:/data/
ports: ports: