Skip to content

Commit

Permalink
[REV] bump version 5.0 to 5.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ysicing committed Mar 11, 2019
1 parent 2e41f3d commit 9d07335
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 59 deletions.
14 changes: 14 additions & 0 deletions .travis.yml
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
4 changes: 2 additions & 2 deletions Dockerfile
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]>

# 时区设置
Expand Down Expand Up @@ -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"]
63 changes: 6 additions & 57 deletions release.sh
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}

0 comments on commit 9d07335

Please sign in to comment.