update Dockerfile, changelog & release scripts

This commit is contained in:
Matej Kramny 2017-02-22 13:58:45 -08:00
parent 80a34026e3
commit 44017069df
3 changed files with 46 additions and 8 deletions

View File

@ -1,4 +1,35 @@
v2.2.0 / 2017-02-22
===================
* bump version to 2.2.0
* update add templates, gh release script
* compile with go1.8
* Merge branch 'master' of github.com:ansible-semaphore/semaphore
* update contributing.md
* Merge pull request #257 from strangeman/dashboard-alias
* Merge pull request #262 from strangeman/templateid-ui
* Merge pull request #268 from nightvisi0n/fix_go-github-api-break
* fix api breaking of google/go-github
* Merge pull request #265 from ansible-semaphore/fix-264
* Reload on modal dismiss
* Merge pull request #258 from strangeman/docs-improve
* Add/Update Template dialog: Add Template ID field, mark some fields as required
* Add task template name to log too
* Small documentation improvements
* Add task template names for dashboard
* Merge pull request #256 from kpashka/master
* Remove trailing dot-slash in find output
* Copy-paste fixes
* It's method, not a function
* Use temp path for update repository function
* Pass OS environment variables to Ansible
* Added link to discord
* Merge pull request #244 from jerrygb/patch-1
* Update CONTRIBUTING.md
* Merge pull request #241 from pianzide1117/master
* fix error route /project/{project_id}/template ==> /project/{project_id}/templates
## v2.1.0 | 22-12-2016
* fix #202

View File

@ -1,15 +1,12 @@
FROM alpine
RUN apk add --no-cache git ansible mysql-client curl openssh-client
RUN curl -L https://github.com/ansible-semaphore/semaphore/releases/download/v2.1.0/semaphore_linux_amd64 > /usr/bin/semaphore && chmod +x /usr/bin/semaphore && mkdir -p /etc/semaphore/playbooks
RUN curl -L https://github.com/ansible-semaphore/semaphore/releases/download/v2.2.0/semaphore_linux_amd64 > /usr/bin/semaphore && chmod +x /usr/bin/semaphore && mkdir -p /etc/semaphore/playbooks
ADD semaphore-startup.sh /usr/bin/semaphore-startup.sh
RUN chmod +x /usr/bin/semaphore-startup.sh
EXPOSE 3000
ENTRYPOINT ["/usr/bin/semaphore-startup.sh"]
CMD ["/usr/bin/semaphore", "-config", "/etc/semaphore/semaphore_config.json"]

16
make.sh
View File

@ -47,10 +47,17 @@ var Version string = "$VERSION"
HEREDOC
git add util/version.go && git commit -m "bump version to $VERSION"
echo "Updating changelog:"
git changelog -t "v$VERSION"
echo "\nCommitting version.go and changelog update"
git add util/version.go CHANGELOG.md && git commit -m "update changelog, bump version to $VERSION"
echo "\nTagging release"
git tag -m "v$VERSION release" "v$VERSION"
echo "\nPushing to repository"
git push origin master "v$VERSION"
github-release release --draft -u ansible-semaphore -r semaphore -t "v$VERSION"
echo "\nCreating draft release v$VERSION"
github-release release --draft -u ansible-semaphore -r semaphore -t "v$VERSION" -d "## Special thanks to\n\n## Installation\n\nFollow [wiki/Installation](https://github.com/ansible-semaphore/semaphore/wiki/Installation)\n\n## Changelog"
fi
go-bindata $BINDATA_ARGS config.json db/migrations/ $(find public/* -type d -print)
@ -81,5 +88,8 @@ if [ "$CIRCLE_ARTIFACTS" != "" ]; then
fi
if [ "$1" == "release" ]; then
github-release upload -u ansible-semaphore -r semaphore -t "v$2" -f "semaphore_*"
echo "Uploading files.."
VERSION=$2 find . -name "semaphore_*" -exec sh -c 'github-release upload -u ansible-semaphore -r semaphore -t "v$VERSION" -n "${1/.\/}" -f "$1"' _ {} \;
echo "Done"
rm -f semaphore_*
fi