Merge pull request #105 from dockboard/master

Add Memcached and Redis Docker supported with MySQL and PostGreSQL

dockerfiles/README.md

@@ -1,16 +1,14 @@
-### Gogs Install With Docker
+### Install Gogs With Docker
 
-
-
-#### Gogs With MySQL
-
-Deploying gogs in [Docker](http://www.docker.io/) is just as easy as eating a pie, what you do is just open the `dockerfiles/build.sh` file, replace the configs:
+Deplying gogs in [Docker](http://www.docker.io/) is just as easy as eating a pie, what you do is just open the `dockerfiles/build.sh` file, replace the confis:
 
 ```
-DB_TYPE="mysql"
-DB_PASSWORD="YOUR_MYSQL_PASSWORD"
-DB_RUN_NAME="YOUR_MYSQL_RUN_NAME"
-HOST_PORT="YOUR_HOST_PORT"
+DB_TYPE="YOUR_DB_TYPE"            # type of database, support 'mysql' and 'postgres'
+MEM_TYPE="YOUR_MEM_TYPE"          # type of memory database, support 'redis' and 'memcache'
+DB_PASSWORD="YOUR_DB_PASSWORD"    # The database password.
+DB_RUN_NAME="YOUR_DB_RUN_NAME"    # The --name option value when run the database image.
+MEM_RUN_NAME="YOUR_MEM_RUN_NAME"  # The --name option value when run the mem database image.
+HOST_PORT="YOUR_HOST_PORT"        # The port on host, which will be redirected to the port 3000 inside gogs container.
 ```
 
 And run:
@@ -23,13 +21,13 @@ The build might take some time, just be paient. After it finishes, you will rece
 
 ```
 Now we have the MySQL image(running) and gogs image, use the follow command to start gogs service( the content might be different, according to your own configs):
- docker run -i -t --link gogs_mysql:db -p 3333:3000 gogs/gogits
+ docker run -i -t --link YOUR_DB_RUN_NAME:db  --link YOUR_MEM_RUN_NAME:mem  -p YOUR_HOST_PORT:3000 gogits/gogs 
 ```
 
 Just follow the message, run:
 
 ```
- docker run -i -t --link gogs_mysql:db -p 3333:3000 gogs/gogits
+ docker run -i -t --link YOUR_DB_RUN_NAME:db  --link YOUR_MEM_RUN_NAME:mem  -p YOUR_HOST_PORT:3000 gogits/gogs 
 ```
 
 Now we have gogs running! Open the browser and navigate to:
@@ -39,22 +37,4 @@ http://YOUR_HOST_IP:YOUR_HOST_PORT
 ```
 
 Let's 'gogs'!
-
-#### Gogs With PostgreSQL
-
-Installing Gogs with PostgreSQL is nearly the same with installing it with MySQL. What you do is just change the DB_TYPE in build.sh to 'postgres'.
-
-#### Gogs, MySQL With Redis
-
-
-#### Gogs, MySQL With Memcached
-
-
-#### Gogs, PostgreSQL With Redis
-
-
-#### Gogs, PostgreSQL With Memcached
-
-
-
-
+Ouya~

dockerfiles/build.sh

@@ -1,29 +1,68 @@
 # Configs of the docker images, you might have specify your own configs here.
-# type of database, support 'mysql' and 'postgres'
-DB_TYPE="postgres"
-DB_PASSWORD="YOUR_DB_PASSWORD"
-DB_RUN_NAME="YOUR_DB_RUN_NAME"
-HOST_PORT="YOUR_HOST_PORT"
+
+DB_TYPE="YOUR_DB_TYPE"            # type of database, support 'mysql' and 'postgres'
+MEM_TYPE="YOUR_MEM_TYPE"          # type of memory database, support 'redis' and 'memcache'
+DB_PASSWORD="YOUR_DB_PASSWORD"    # The database password.
+DB_RUN_NAME="YOUR_DB_RUN_NAME"    # The --name option value when run the database image.
+MEM_RUN_NAME="YOUR_MEM_RUN_NAME"  # The --name option value when run the mem database image.
+HOST_PORT="YOUR_HOST_PORT"        # The port on host, which will be redirected to the port 3000 inside gogs container.
+
+# 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=""
 
 # Replace the database root password in database image Dockerfile.
 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#//" 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"
 

dockerfiles/images/gogits/Dockerfile

@@ -3,7 +3,9 @@ MAINTAINER  Meaglith Ma <genedna@gmail.com> (@genedna)
 
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN echo "deb http://mirrors.aliyun.com/ubuntu/ saucy main restricted" > /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-updates main restricted" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy universe" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-updates universe" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy multiverse" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-updates multiverse" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-backports main restricted universe multiverse" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-security main restricted" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-security universe" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-security multiverse" >> /etc/apt/sources.list
+#aliyun#RUN echo "deb http://mirrors.aliyun.com/ubuntu/ saucy main restricted" > /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-updates main restricted" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy universe" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-updates universe" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy multiverse" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-updates multiverse" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-backports main restricted universe multiverse" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-security main restricted" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-security universe" >> /etc/apt/sources.list && echo "deb http://mirrors.aliyun.com/ubuntu/ saucy-security multiverse" >> /etc/apt/sources.list
+
+#nchc#RUN echo "deb http://free.nchc.org.tw/ubuntu/ saucy main restricted" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy main restricted" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-updates main restricted" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-updates main restricted" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy universe" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy universe" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-updates universe" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-updates universe" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy multiverse" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy multiverse" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-updates multiverse" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-updates multiverse" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-backports main restricted universe multiverse" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-backports main restricted universe multiverse" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-security main restricted" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-security main restricted" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-security universe" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-security universe" >> /etc/apt/source.list && echo "deb http://free.nchc.org.tw/ubuntu/ saucy-security multiverse" >> /etc/apt/source.list && echo "deb-src http://free.nchc.org.tw/ubuntu/ saucy-security multiverse" >> /etc/apt/source.list && echo "deb http://extras.ubuntu.com/ubuntu saucy main" >> /etc/apt/source.list && echo "deb-src http://extras.ubuntu.com/ubuntu saucy main" >> /etc/apt/source.list 
 
 RUN mkdir -p /go
 ENV PATH /usr/local/go/bin:/go/bin:$PATH
@@ -11,14 +13,13 @@ ENV GOROOT /usr/local/go
 ENV GOPATH /go
 
 RUN apt-get update && apt-get install --yes --force-yes curl git mercurial zip wget ca-certificates build-essential
+RUN apt-get install -yq vim
 
 RUN curl -s http://docker.u.qiniudn.com/go1.2.1.src.tar.gz | tar -v -C /usr/local -xz
 RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1
 
-# You may need a proxy, if github is very slow.
-#RUN http_proxy=106.187.38.45:3128 go get -u github.com/gogits/gogs 
-RUN go get -u github.com/gogits/gogs 
-RUN cd $GOPATH/src/github.com/gogits/gogs && go build
+RUN go get -u -d github.com/gogits/gogs 
+RUN cd $GOPATH/src/github.com/gogits/gogs && git checkout dev && git pull origin dev && go install && go build -tags redis
 
 # Clean all the unused packages
 RUN apt-get autoremove -y

dockerfiles/images/gogits/deploy.sh

@@ -4,22 +4,47 @@
 DB_TYPE=THE_DB_TYPE
 DB_PASSWORD=THE_DB_PASSWORD
 DB_ALIAS=DB
+MEM_TYPE=THE_MEM_TYPE
+
 DB_TYPE_LINE=`awk '$0 ~ str{print NR}' str="DB_TYPE = mysql" $GOPATH/src/github.com/gogits/gogs/conf/app.ini`
 DB_PASSWORD_LINE=`awk '$0 ~ str{print NR+1}' str="USER = root" $GOPATH/src/github.com/gogits/gogs/conf/app.ini`
 
 sed -i "${DB_TYPE_LINE}s/.*$/DB_TYPE = $DB_TYPE/g" $GOPATH/src/github.com/gogits/gogs/conf/app.ini 
 sed -i "${DB_PASSWORD_LINE}s/.*$/PASSWD = $DB_PASSWORD/g" $GOPATH/src/github.com/gogits/gogs/conf/app.ini 
 
-if [ $DB_TYPE = "postgres" ]
+
+
+if [ $MEM_TYPE != "" ]
   then
-  # Add the postgres in gogs image.
-  apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
-  echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main" > /etc/apt/sources.list.d/pgdg.list
-  apt-get update
-  apt-get -y -q install python-software-properties software-properties-common
-  apt-get -y -q install postgresql-9.3 postgresql-client-9.3 postgresql-contrib-9.3
+  MEM_HOST_LINE=`awk '$0 ~ str{print NR+6}' str="ADAPTER = memory" $GOPATH/src/github.com/gogits/gogs/conf/app.ini`
+                
+  _MEM_ADDR=`echo $MEM_PORT | cut -d '/' -f 3 | cut -d ':' -f 1`
+  _MEM_PORT=`echo $MEM_PORT | cut -d '/' -f 3 | cut -d ':' -f 2`
+
+  # take advantage of memory db for adapter and provider
+  sed -i "s/ADAPTER = memory/ADAPTER = $MEM_TYPE/g" $GOPATH/src/github.com/gogits/gogs/conf/app.ini
+  # Comment the memory interval since we don't use 'memory' as adapter
+  sed -i "s/INTERVAL = 60/;INTERVAL = 60/g" $GOPATH/src/github.com/gogits/gogs/conf/app.ini
+
+
+  case $MEM_TYPE in
+    "redis")
+    # Modify the adapter host
+    sed -i "${MEM_HOST_LINE}s/.*/HOST = $_MEM_ADDR:$_MEM_PORT/" $GOPATH/src/github.com/gogits/gogs/conf/app.ini
+    sed -i "s/PROVIDER = file/PROVIDER = $MEM_TYPE/g" $GOPATH/src/github.com/gogits/gogs/conf/app.ini
+    # Modify the provider config
+    sed -i "s#PROVIDER_CONFIG = data/sessions#PROVIDER_CONFIG = $_MEM_ADDR:$_MEM_PORT#g" $GOPATH/src/github.com/gogits/gogs/conf/app.ini
+    ;;
+
+    "memcache")
+      # Modify the adapter host
+      sed -i "${MEM_HOST_LINE}s/.*/HOST = $_MEM_ADDR:$_MEM_PORT/" $GOPATH/src/github.com/gogits/gogs/conf/app.ini
+    ;;
+  esac
+
 fi
 
+
 ## Replace the database address and port
 # When using --link in docker run, the database image's info looks like this:
 # DB_PORT=tcp://172.17.0.2:3306

dockerfiles/images/memcache/Dockerfile

@@ -0,0 +1,26 @@
+FROM ubuntu
+
+# Set the file maintainer (your name - the file's author)
+MAINTAINER Borja Burgos <borja@tutum.co>
+
+ENV DEBIAN_FRONTEND noninteractive
+
+# Update the default application repository sources list
+RUN apt-get update
+
+# Install Memcached
+RUN apt-get install -y memcached
+
+# Port to expose (default: 11211)
+EXPOSE 11211
+
+# Default Memcached run command arguments
+# Change to limit memory when creating container in Tutum 
+CMD ["-m", "64"]
+
+# Set the user to run Memcached daemon
+USER daemon
+
+# Set the entrypoint to memcached binary
+ENTRYPOINT memcached
+

dockerfiles/images/mysql/Dockerfile

@@ -10,7 +10,7 @@ RUN add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu $(lsb_release -s
 RUN apt-get --yes --force-yes update
 RUN apt-get --yes --force-yes upgrade 
 
-ENV MYSQL_PASSWORD THE_MYSQL_PASSWORD
+ENV MYSQL_PASSWORD THE_DB_PASSWORD
 
 RUN echo "mysql-server mysql-server/root_password password $MYSQL_PASSWORD" | debconf-set-selections  
 RUN echo "mysql-server mysql-server/root_password_again password $MYSQL_PASSWORD" | debconf-set-selections

dockerfiles/images/postgres/Dockerfile

@@ -1,6 +1,8 @@
 FROM ubuntu
 MAINTAINER SvenDowideit@docker.com
 
+ENV DEBIAN_FRONTEND noninteractive
+
 # Add the PostgreSQL PGP key to verify their Debian packages.
 # It should be the same key as https://www.postgresql.org/media/keys/ACCC4CF8.asc 
 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8

dockerfiles/images/redis/Dockerfile

@@ -0,0 +1,14 @@
+FROM   	    stackbrew/ubuntu:saucy
+MAINTAINER  Meaglith Ma <genedna@gmail.com> (@genedna), Lance Ju <juzhenatpku@gmail.com> (@crystaldust)
+
+ENV DEBIAN_FRONTEND noninteractive
+
+ENV         DEBIAN_FRONTEND noninteractive
+
+RUN         apt-get update && apt-get install -y redis-server
+# Usually redis doesn't need a password
+#RUN         sed -i "s/# requirepass foobared/requirepass THE_REDIS_PASSWORD/g" /etc/redis/redis.conf
+EXPOSE      6379
+ENTRYPOINT  ["/usr/bin/redis-server"]
+CMD ["--bind", "0.0.0.0"]
+