From a044c24c3db4b18b20406045b40e55ce15f941a0 Mon Sep 17 00:00:00 2001 From: Meaglith Ma <genedna@gmail.com> Date: Tue, 1 Apr 2014 14:27:21 +0800 Subject: [PATCH] Update the Golang Dockerfile and add mysql Dockerfile --- dockerfiles/images/gogits/Dockerfile | 6 ++++-- dockerfiles/images/gogits/sources.list | 10 ---------- dockerfiles/images/mysql/Dockerfile | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 12 deletions(-) delete mode 100644 dockerfiles/images/gogits/sources.list create mode 100644 dockerfiles/images/mysql/Dockerfile diff --git a/dockerfiles/images/gogits/Dockerfile b/dockerfiles/images/gogits/Dockerfile index cb16d1cf5f..bcd6e69085 100644 --- a/dockerfiles/images/gogits/Dockerfile +++ b/dockerfiles/images/gogits/Dockerfile @@ -1,14 +1,14 @@ FROM stackbrew/ubuntu:13.10 MAINTAINER Meaglith Ma <genedna@gmail.com> (@genedna) -ADD ./sources.list /etc/apt/ +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 RUN mkdir -p /go ENV PATH /usr/local/go/bin:/go/bin:$PATH ENV GOROOT /usr/local/go ENV GOPATH /go -RUN apt-get update && apt-get install -y curl git mercurial zip wget ca-certificates build-essential +RUN apt-get update && apt-get install --yes --force-yes curl git mercurial zip wget ca-certificates build-essential 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 @@ -18,3 +18,5 @@ RUN cd $GOPATH/src/github.com/gogits/gogs && go build RUN apt-get autoremove -y RUN apt-get clean all + +EXPOSE 3000 diff --git a/dockerfiles/images/gogits/sources.list b/dockerfiles/images/gogits/sources.list deleted file mode 100644 index 58214b4ed2..0000000000 --- a/dockerfiles/images/gogits/sources.list +++ /dev/null @@ -1,10 +0,0 @@ -deb http://mirrors.aliyun.com/ubuntu/ saucy main restricted -deb http://mirrors.aliyun.com/ubuntu/ saucy-updates main restricted -deb http://mirrors.aliyun.com/ubuntu/ saucy universe -deb http://mirrors.aliyun.com/ubuntu/ saucy-updates universe -deb http://mirrors.aliyun.com/ubuntu/ saucy multiverse -deb http://mirrors.aliyun.com/ubuntu/ saucy-updates multiverse -deb http://mirrors.aliyun.com/ubuntu/ saucy-backports main restricted universe multiverse -deb http://mirrors.aliyun.com/ubuntu/ saucy-security main restricted -deb http://mirrors.aliyun.com/ubuntu/ saucy-security universe -deb http://mirrors.aliyun.com/ubuntu/ saucy-security multiverse diff --git a/dockerfiles/images/mysql/Dockerfile b/dockerfiles/images/mysql/Dockerfile new file mode 100644 index 0000000000..c3b85e3b94 --- /dev/null +++ b/dockerfiles/images/mysql/Dockerfile @@ -0,0 +1,18 @@ +FROM stackbrew/ubuntu:13.10 +MAINTAINER Meaglith Ma <genedna@gmail.com> (@genedna) + +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 + +#ENV MYSQL_PASSWORD docker + +#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 + +RUN apt-get update && apt-get install -y --force-yes mysql-server +RUN sed -i -e"s/^bind-address\s*=\s*127.0.0.1/bind-address = 0.0.0.0/" /etc/mysql/my.cnf + +RUN apt-get autoremove -y +RUN apt-get clean all + +EXPOSE 3306 +CMD ["/usr/bin/mysqld_safe", "--skip-syslog", "--log-error=/dev/null"]