diff --git a/jobservice/conf/app.conf b/Deploy/config/jobservice/app.conf similarity index 100% rename from jobservice/conf/app.conf rename to Deploy/config/jobservice/app.conf diff --git a/Deploy/docker-compose.yml b/Deploy/docker-compose.yml index 69e027efc..e6308669f 100644 --- a/Deploy/docker-compose.yml +++ b/Deploy/docker-compose.yml @@ -63,6 +63,7 @@ services: - ./config/jobservice/env volumes: - /data/job_logs:/var/log/jobs + - ./config/jobservice/app.conf:/etc/jobservice/app.conf depends_on: - ui logging: diff --git a/Dockerfile.job b/Dockerfile.job index 4315d71a5..5f80a04e2 100644 --- a/Dockerfile.job +++ b/Dockerfile.job @@ -14,6 +14,5 @@ RUN go get -d github.com/docker/distribution \ && go get -d github.com/go-sql-driver/mysql \ && go build -v -a -o /go/bin/harbor_jobservice \ && chmod u+x /go/bin/harbor_jobservice -ADD ./jobservice/conf /go/bin/conf WORKDIR /go/bin/ ENTRYPOINT ["/go/bin/harbor_jobservice"] diff --git a/job/config/config.go b/job/config/config.go index d97292979..b5477e2f3 100644 --- a/job/config/config.go +++ b/job/config/config.go @@ -20,6 +20,7 @@ import ( "os" "strconv" + "github.com/astaxie/beego" "github.com/vmware/harbor/utils/log" ) @@ -79,6 +80,12 @@ func init() { verifyRemoteCert = "on" } + configPath := os.Getenv("CONFIG_PATH") + if len(configPath) != 0 { + log.Infof("Config path: %s", configPath) + beego.LoadAppConfig("ini", configPath) + } + log.Debugf("config: maxJobWorkers: %d", maxJobWorkers) log.Debugf("config: localUIURL: %s", localUIURL) log.Debugf("config: localRegURL: %s", localRegURL)