test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-11-29 18:27:58 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[FIX] push local image to goodrain.me #40

Browse Source
This commit is contained in:
ysicing 2018-01-28 13:08:13 +08:00
parent f823905162
commit 6899e925b9
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hack/contrib/docker/node/gaops/jobs/install/compute/proxy/proxy.sh
View File

@ -360,9 +360,18 @@ function prepare() {
)
}
function do_image(){
log.info "docker pull runner"
image::exist goodrain.me/runner:latest || image::pull goodrain.me/runner:latest
log.info "docker pull adapter"
image::exist goodrain.me/adapter:latest || image::pull goodrain.me/adapter:latest
log.info "docker pull pause-amd64"
image::exist goodrain.me/pause-amd64:3.0 || image::pull goodrain.me/pause-amd64:3.0
}
function run() {
do_image
image::exist $RBD_PROXY || (
log.info "pull image $RBD_PROXY"

25
hack/contrib/docker/node/gaops/jobs/install/compute/sync_images/sync_images.sh → hack/contrib/docker/node/gaops/jobs/install/compute/tasks/sync_images.sh
View File

@ -1,12 +1,5 @@
#!/bin/bash
# 同步镜像
# 安装相关组件
REPO_VERSION=$1
INSTALL_TYPE=${2:-online}
IMAGE_PATH="/root/acpimg"
function log.info() {
echo " $*"
}
@ -24,10 +17,10 @@ function image::exist() {
IMAGE_NAME=$1
docker images | sed 1d | awk '{print $1":"$2}' | grep $IMAGES_NAME >/dev/null 2>&1
if [ $? -eq 0 ];then
echo "image $IMAGE_NAME exists"
log.info "image $IMAGE_NAME exists"
return 0
else
echo "image $IMAGE_NAME not exists"
log.info "image $IMAGE_NAME not exists"
return 1
fi
}
@ -36,10 +29,10 @@ function image::pull() {
IMAGES_NAME=$1
docker pull $IMAGES_NAME
if [ $? -eq 0 ];then
echo "pull image $IMAGES_NAME success"
log.info "pull image $IMAGES_NAME success"
return 0
else
echo "pull image $IMAGES_NAME failed"
log.info "pull image $IMAGES_NAME failed"
return 1
fi
}
@ -77,12 +70,12 @@ function image::package() {
function run() {
log.info "pull images"
image::exist goodrain.me/runner:latest || image::pull goodrain.me/runner:latest || image::push runner latest
image::exist goodrain.me/adapter:latest || image::pull goodrain.me/adapter:latest || image::push adapter $REPO_VERSION
image::exist goodrain.me/pause-amd64:3.0 || image::pull goodrain.me/pause-amd64:3.0 || image::push pause-amd64 3.0
image::exist goodrain.me/runner:latest || image::pull goodrain.me/runner:latest #|| image::push runner latest
image::exist goodrain.me/adapter:latest || image::pull goodrain.me/adapter:latest #|| image::push adapter $REPO_VERSION
image::exist goodrain.me/pause-amd64:3.0 || image::pull goodrain.me/pause-amd64:3.0 #|| image::push pause-amd64 3.0
image::package gr-nsenter
image::package gr-docker-compose
image::package gr-docker-utils
#image::package gr-docker-compose
#image::package gr-docker-utils
image::package gr-midonet-cni
}

8
hack/contrib/docker/node/gaops/jobs/install/manage/tasks/do_image.sh
View File

@ -68,10 +68,10 @@ function run() {
if [ ! -f "/grdata/.do_image" ];then
log.info "first node"
image::pull goodrain.me/runner:latest || image::push runner latest
image::pull goodrain.me/adapter:latest || image::push adapter 3.4
image::pull goodrain.me/pause-amd64:3.0 || image::push pause-amd64 3.0
image::pull goodrain.me/builder:latest || image::push builder latest
image::pull goodrain.me/runner:latest && image::push runner latest
image::pull goodrain.me/adapter:latest && image::push adapter 3.4
image::pull goodrain.me/pause-amd64:3.0 && image::push pause-amd64 3.0
image::pull goodrain.me/builder:latest && image::push builder latest
touch /grdata/.do_image
else
log.info "not 1st node"