diff options
| author | Baiju Muthukadan <baiju.m.mail@gmail.com> | 2014-06-05 21:46:46 +0530 |
|---|---|---|
| committer | Baiju Muthukadan <baiju.m.mail@gmail.com> | 2014-06-05 21:46:46 +0530 |
| commit | 925ccc2608839e34d30849a310e06af600db1604 (patch) | |
| tree | 40e8629ecadaed48436ad4cacd7ea5719fc33df4 /dockerfiles | |
| parent | afc6cbc4797571a138eb150768fb9276b4da702b (diff) | |
| download | gitea-925ccc2608839e34d30849a310e06af600db1604.tar.gz gitea-925ccc2608839e34d30849a310e06af600db1604.zip | |
use 'docker.io' command instead of 'docker'
Diffstat (limited to 'dockerfiles')
| -rwxr-xr-x | dockerfiles/build.sh | 12 | ||||
| -rwxr-xr-x | dockerfiles/run.sh | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/dockerfiles/build.sh b/dockerfiles/build.sh index 83f7e9a566..0b7cc2ff11 100755 --- a/dockerfiles/build.sh +++ b/dockerfiles/build.sh @@ -36,22 +36,22 @@ if [ $MEM_TYPE != "" ] sed -i "${GOGS_BUILD_LINE}s/$/ -tags $MEM_TYPE/" images/gogits/Dockerfile cd images/$MEM_TYPE - docker build -t gogits/$MEM_TYPE . - docker run -d --name $MEM_RUN_NAME gogits/$MEM_TYPE + docker.io build -t gogits/$MEM_TYPE . + docker.io run -d --name $MEM_RUN_NAME gogits/$MEM_TYPE MEM_LINK=" --link $MEM_RUN_NAME:mem " cd ../../ fi # Build the database image cd images/$DB_TYPE -docker build -t gogits/$DB_TYPE . +docker.io build -t gogits/$DB_TYPE . # ## Build the gogits image cd ../gogits -docker build -t gogits/gogs . +docker.io build -t gogits/gogs . #sed -i "s#RUN go get -u -tags $MEM_TYPE github.com/gogits/gogs#RUN go get -u github.com/gogits/gogs#g" Dockerfile @@ -60,9 +60,9 @@ sed -i "s/ -tags $MEM_TYPE//" Dockerfile # ## Run MySQL image with name -docker run -d --name $DB_RUN_NAME gogits/$DB_TYPE +docker.io run -d --name $DB_RUN_NAME gogits/$DB_TYPE # ## Run gogits image and link it to the database image echo "Now we have the $DB_TYPE image(running) and gogs image, use the follow command to start gogs service:" -echo -e "\033[33m docker run -i -t --link $DB_RUN_NAME:db $MEM_LINK -p $HOST_PORT:3000 gogits/gogs \033[0m" +echo -e "\033[33m docker.io run -i -t --link $DB_RUN_NAME:db $MEM_LINK -p $HOST_PORT:3000 gogits/gogs \033[0m" diff --git a/dockerfiles/run.sh b/dockerfiles/run.sh index 7721ab41d4..a199442453 100755 --- a/dockerfiles/run.sh +++ b/dockerfiles/run.sh @@ -6,8 +6,8 @@ MYSQL_ALIAS="db" HOST_PORT="3000" ## Run MySQL image with name -docker run -d --name $MYSQL_RUN_NAME gogs/mysql +docker.io run -d --name $MYSQL_RUN_NAME gogs/mysql # ## Run gogits image and link it to the MySQL image -docker run --link $MYSQL_RUN_NAME:$MYSQL_ALIAS -p $HOST_PORT:3000 gogs/gogits +docker.io run --link $MYSQL_RUN_NAME:$MYSQL_ALIAS -p $HOST_PORT:3000 gogs/gogits |