Commit e3530692 by 刘一凡

Merge branch 'dev' into 'master'

Dev

See merge request !1
parents f9fe4874 512fbe83
# Configure Project
This project contains the latest configure file.
The new configure file will upgrade itself every time you execute it with Internet.
But if you are off line, it will just give a warning and execute the version on your computer.
......@@ -2,9 +2,28 @@
#
# Tiaozhan Docker Image Configure Tool
#
# Copyright (C) 2015 Tiaozhan Net. All Rights Reserved.
# Copyright (C) 2016 Tiaozhan Net. All Rights Reserved.
#
# Maintainer : gho1920 <lixiang@tiaozhan.com>
# Luffbee <liuyifan@tiaozhan.com>
CONF_SHA1=
newconf() {
if [ "$CONF_SHA1" != "`sha1sum configure`" ];then
echo "$0: [NOTICE] The configure has upgraded, please add it to git."
fi
/bin/sh "$0" --no-upgrade "$@"
exit "$?"
}
if [ "$1" != "--no-upgrade" ];then
CONF_SHA1=`sha1sum configure`
curl -m 5 -sSLOf 'https://git.tiaozhan.com/tiaozhan-op/configure/raw/master/configure' && \
newconf "$@" || \
echo "$0: [WARNING] Your configure script may be a old one."
else shift
fi
set -e
......@@ -105,12 +124,21 @@ clean: stop
build: stop
docker build -t ${DOCKER_IMAGE} .
start:
start:
docker-compose up
startd:
docker-compose up -d
test:
test:
docker-compose run --rm ${DOCKER_CONTAIN} test
Version:
docker-compose run --rm ${DOCKER_CONTAIN} version
shell:
docker-compose run --rm ${DOCKER_CONTAIN} /bin/sh
push:
docker push ${DOCKER_IMAGE}
......@@ -119,11 +147,11 @@ pull:
deploy_test: stop build test push clean
deploy: stop pull start
deploy: stop pull startd
unit: stop build test
run: stop build start
run: stop build startd
END
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment