diff --git a/pipeline.yml b/pipeline.yml index 7950b3d..4644a6c 100644 --- a/pipeline.yml +++ b/pipeline.yml @@ -60,7 +60,7 @@ jobs: cd git-develop npm install npm test - - name: deploy-develop + - name: deploy-develop-image plan: - get: git-develop passed: [test-develop] @@ -85,6 +85,7 @@ jobs: echo $(./scripts/get_build.sh) > ../version/build.info echo $(./scripts/get_version.sh) > ../version/version.info echo $(./scripts/get_tag.sh) > ../version/tag.info + echo "dev" > ../version/tag cat ../version/build.info - task: package config: @@ -102,24 +103,22 @@ jobs: args: - -c - | - mkdir tmp - cd tmp - cp ../version/build.info . - cp ../version/version.info . - cp ../version/tag.info . - cp ../git-master/package*.json . - cp ../git-master/index.js . - cp -r ../git-master/assets . - cp -r ../git-master/bot . - cp -r ../git-master/data . - cp ../git-master/entrypoint.js . - cp ../git-master/Dockerfile . - cp ../git-master/README.md . - cp ../git-master/LICENSE.md . + cd package + cp ../version/* . + cp ../git-develop/package*.json . + cp ../git-develop/index.js . + cp -r ../git-develop/assets . + cp -r ../git-develop/bot . + cp -r ../git-develop/data . + cp ../git-develop/entrypoint.sh . + cp ../git-develop/Dockerfile . + cp ../git-develop/README.md . + cp ../git-develop/LICENSE.md . + ls -al . - put: docker-image params: build: package - tag_file: package/tag.info + tag_file: package/tag tag_as_latest: false # Release Pipeline - name: test-release @@ -169,6 +168,7 @@ jobs: echo $(./scripts/get_build.sh) > ../version/build.info echo $(./scripts/get_version.sh) > ../version/version.info echo $(./scripts/get_tag.sh) > ../version/tag.info + cp ../version/tag.info ../version/tag cat ../version/build.info - task: package config: @@ -188,15 +188,13 @@ jobs: - | mkdir tmp cd tmp - cp ../version/build.info . - cp ../version/version.info . - cp ../version/tag.info . + cp ../version/* . cp ../git-master/package*.json . cp ../git-master/index.js . cp -r ../git-master/assets . cp -r ../git-master/bot . cp -r ../git-master/data . - cp ../git-master/entrypoint.js . + cp ../git-master/entrypoint.sh . cp ../git-master/Dockerfile . cp ../git-master/README.md . cp ../git-master/LICENSE.md .