Change the image naming, start with "gogits/"

1 files changed, 43 insertions, 8 deletions

diff --git a/dockerfiles/build.sh b/dockerfiles/build.sh
index 9b39afa59b..d6fb8f5fe3 100755
--- a/dockerfiles/build.sh
+++ b/dockerfiles/build.sh
@@ -1,12 +1,15 @@
 # Configs of the docker images, you might have specify your own configs here.
 
 # type of database, support 'mysql' and 'postgres'
-DB_TYPE="postgres"
-# apt source, you can select 'nchc' or 'aliyun' according to your network.
-APT_SOURCE="nchc"
+DB_TYPE="YOUR_DB_TYPE"
+# type of memory database, support 'redis' and 'memcache'
+MEM_TYPE="YOUR_MEM_TYPE"
+# apt source, you can select 'nchc'(mirror in Taiwan) or 'aliyun'(best for mainlance China users) according to your network, if you could connect to the official unbunt mirror in a fast speed, just leave it to "".
+APT_SOURCE=""
 
 DB_PASSWORD="YOUR_DB_PASSWORD"
 DB_RUN_NAME="YOUR_DB_RUN_NAME"
+MEM_RUN_NAME="YOUR_MEM_RUN_NAME"
 HOST_PORT="YOUR_HOST_PORT"
 
 # Replace the database root password in database image Dockerfile.
@@ -14,22 +17,54 @@ sed -i "s/THE_DB_PASSWORD/$DB_PASSWORD/g" images/$DB_TYPE/Dockerfile
 # Replace the database root password in gogits image deploy.sh file. 
 sed -i "s/THE_DB_PASSWORD/$DB_PASSWORD/g" images/gogits/deploy.sh
 # Replace the apt source in gogits image Dockerfile. 
-sed -i "s/#$APT_SOURCE#//g" images/gogits/Dockerfile
+sed -i "s/#$APT_SOURCE#//" images/gogits/Dockerfile
+# Uncomment the installation of database lib in gogs Dockerfile
+sed -i "s/#$DB_TYPE#//" images/gogits/Dockerfile
 # Replace the database type in gogits image deploy.sh file. 
 sed -i "s/THE_DB_TYPE/$DB_TYPE/g" images/gogits/deploy.sh
 
+if [ $MEM_TYPE != "" ]
+  then
+  # Replace the mem configs in deploy.sh
+  sed -i "s/THE_MEM_TYPE/$MEM_TYPE/g" images/gogits/deploy.sh
+  # Uncomment the installation of go mem lib
+  sed -i "s/#$MEM_TYPE#//" images/gogits/Dockerfile
+
+  # Add the tags when get gogs
+  sed -i "s#RUN go get -u -d github.com/gogits/gogs#RUN go get -u -d -tags $MEM_TYPE github.com/gogits/gogs#g" images/gogits/Dockerfile
+  # Append the tag in gogs build
+  GOGS_BUILD_LINE=`awk '$0 ~ str{print NR}' str="go build" images/gogits/Dockerfile`
+  # Append the build tags
+  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
+  MEM_LINK=" --link $MEM_RUN_NAME:mem "
+  cd ../../
+fi
+
 # Build the database image
 cd images/$DB_TYPE
-docker build -t gogs/$DB_TYPE .
+docker build -t gogits/$DB_TYPE .
 #
+
+
 ## Build the gogits image
 cd ../gogits
-docker build -t gogs/gogits .
+
+docker 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
+
+# Remove the appended tags in go build line(if there is any)
+sed -i "s/ -tags $MEM_TYPE//" Dockerfile
+
 #
 ## Run MySQL image with name
-docker run -d --name $DB_RUN_NAME gogs/$DB_TYPE
+docker 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 -p $HOST_PORT:3000 gogs/gogits \033[0m"
+echo -e "\033[33m docker run -i -t --link $DB_RUN_NAME:db $MEM_LINK -p $HOST_PORT:3000 gogits/gogs \033[0m"