-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
22 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
sudo: required | ||
|
||
services: | ||
- docker | ||
|
||
git: | ||
depth: 1 | ||
|
||
before_install: | ||
- docker pull rainbond/cedar14 | ||
|
||
script: | ||
- docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD | ||
- ./release.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM hub.goodrain.com/dc-deploy/cedar14 | ||
FROM rainbond/cedar14 | ||
MAINTAINER ethan <[email protected]> | ||
|
||
# 时区设置 | ||
|
@@ -29,5 +29,5 @@ RUN mkdir /data && chown rain:rain /data | |
|
||
ADD ./runner /runner | ||
RUN chown rain:rain /runner/init | ||
USER rain | ||
#USER rain | ||
ENTRYPOINT ["/runner/init"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,63 +1,12 @@ | ||
#!/bin/bash | ||
set -xe | ||
|
||
image_name="runner" | ||
release_type=$1 | ||
release_version=5.1.0 | ||
git_commit=$(git log -n 1 --pretty --format=%h) | ||
|
||
if [ "$release_type" == "" ];then | ||
echo "please input release type (community | enterprise | all )" | ||
exit 1 | ||
elif [ "$release_type" == "all" ];then | ||
enterprise_version=$2 | ||
community_version=$3 | ||
else | ||
release_version=$2 | ||
fi | ||
release_desc=${release_version}-${git_commit} | ||
|
||
trap 'clean_tmp; exit' QUIT TERM EXIT | ||
sed "s/__RELEASE_DESC__/${release_desc}/" Dockerfile > Dockerfile.release | ||
|
||
# clear temp file | ||
function clean_tmp() { | ||
echo "clean temporary file..." | ||
[ -f Dockerfile.release ] && rm -rf Dockerfile.release | ||
} | ||
|
||
function release(){ | ||
release_name=$1 # master | enterprise | community | ||
release_version=${2:-latest} # latest | 3.2 | 2017.05 | ||
|
||
if [ "$release_name" == "master" ];then | ||
branch_name=${release_name} | ||
git checkout ${branch_name} | ||
else | ||
branch_name=${release_name}-${release_version} | ||
git checkout ${branch_name} | ||
fi | ||
|
||
echo "Pull newest code..." && sleep 3 | ||
git pull | ||
|
||
# get commit sha | ||
git_commit=$(git log -n 1 --pretty --format=%h) | ||
|
||
|
||
# get git describe info | ||
release_desc=${release_name}-${release_version}-${git_commit} | ||
|
||
sed "s/__RELEASE_DESC__/${release_desc}/" Dockerfile > Dockerfile.release | ||
|
||
docker build -t rainbond/${image_name}:${release_version} -f Dockerfile.release . | ||
docker push rainbond/${image_name}:${release_version} | ||
} | ||
|
||
case $release_type in | ||
"community") | ||
release $1 ${release_version} | ||
;; | ||
"enterprise") | ||
release $1 ${release_version} | ||
;; | ||
"master") | ||
release $1 ${release_version} | ||
;; | ||
esac | ||
docker build -t rainbond/runner:${release_version} -f Dockerfile.release . | ||
docker push rainbond/runner:${release_version} |