diff --git a/.gitignore b/.gitignore index 1672e9c4..43174571 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ log/ .env /web/ generated_*.go +config/initialization.dsl +config/system_config.yml diff --git a/Jenkinsfile b/Jenkinsfile index 9e96317e..e54c5628 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,7 +32,7 @@ pipeline { sh label: 'copy-license', script: 'cd /home/jenkins/go/src/infini.sh/console && cp ../framework/LICENSE bin && cat ../framework/NOTICE NOTICE > bin/NOTICE' - sh label: 'copy-configs', script: 'cd /home/jenkins/go/src/infini.sh/console && mkdir -p bin/config && cp config/*.json bin/config && cp config/*.yml bin/config && cp config/*.tpl bin/config' + sh label: 'copy-configs', script: 'cd /home/jenkins/go/src/infini.sh/console && mkdir -p bin/config && cp config/*.json bin/config && cp config/*.tpl bin/config' sh label: 'package-linux-amd64', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-amd64.tar.gz console-linux-amd64 console.yml LICENSE NOTICE config' sh label: 'package-linux-386', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-386.tar.gz console-linux-386 console.yml LICENSE NOTICE config' diff --git a/Jenkinsfile-centos-docker b/Jenkinsfile-centos-docker index dbfb771c..6626db4f 100644 --- a/Jenkinsfile-centos-docker +++ b/Jenkinsfile-centos-docker @@ -29,7 +29,7 @@ pipeline { sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm run build' sh 'cd /home/jenkins/go/src/infini.sh/console && git pull origin master && make config build && chmod a+x bin/console' - sh label: 'copy-configs', script: 'cd /home/jenkins/go/src/infini.sh/console && mkdir -p bin/config && cp config/*.json bin/config' + sh label: 'copy-configs', script: 'cd /home/jenkins/go/src/infini.sh/console && mkdir -p bin/config && cp config/*.json bin/config && cp config/*.tpl bin/config' sh label: 'docker-build', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && docker build -t infini-centos-console -f ../docker/centos-Dockerfile .' sh label: 'docker-tagging', script: 'docker tag infini-centos-console infinilabs/console:centos-$VERSION-$BUILD_NUMBER' sh label: 'docker-push', script: 'docker push infinilabs/console:centos-$VERSION-$BUILD_NUMBER' diff --git a/Jenkinsfile-docker b/Jenkinsfile-docker index 58eb89d5..660c0411 100644 --- a/Jenkinsfile-docker +++ b/Jenkinsfile-docker @@ -29,7 +29,7 @@ pipeline { sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm run build' sh 'cd /home/jenkins/go/src/infini.sh/console && git pull origin master && make config build && chmod a+x bin/console' - sh label: 'copy-configs', script: 'cd /home/jenkins/go/src/infini.sh/console && mkdir -p bin/config && cp config/*.json bin/config' + sh label: 'copy-configs', script: 'cd /home/jenkins/go/src/infini.sh/console && mkdir -p bin/config && cp config/*.json bin/config && cp config/*.tpl bin/config' sh label: 'docker-build', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && docker build -t infini-console -f ../docker/Dockerfile .' sh label: 'docker-tagging', script: 'docker tag infini-console infinilabs/console:latest && docker tag infini-console infinilabs/console:$VERSION-$BUILD_NUMBER' sh label: 'docker-push', script: 'docker push infinilabs/console:$VERSION-$BUILD_NUMBER && docker push infinilabs/console:latest'