From 5e747bc877957c04425fd6d4753794a54798b622 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sun, 28 Sep 2014 03:31:50 -0400 Subject: [PATCH] Clean old dockerfiles --- README.md | 2 +- gogs.go | 3 +- scripts/dockerfiles/README.md | 56 -------------- scripts/dockerfiles/build.sh | 77 ------------------- scripts/dockerfiles/images/gogits/Dockerfile | 29 ------- scripts/dockerfiles/images/gogits/deploy.sh | 60 --------------- scripts/dockerfiles/images/memcache/.gitkeep | 0 .../dockerfiles/images/memcache/Dockerfile | 24 ------ scripts/dockerfiles/images/mysql/.gitkeep | 0 scripts/dockerfiles/images/mysql/Dockerfile | 35 --------- scripts/dockerfiles/images/postgres/.gitkeep | 0 .../dockerfiles/images/postgres/Dockerfile | 50 ------------ scripts/dockerfiles/images/redis/.gitkeep | 0 scripts/dockerfiles/images/redis/Dockerfile | 10 --- scripts/dockerfiles/run.sh | 19 ----- templates/.VERSION | 2 +- 16 files changed, 3 insertions(+), 364 deletions(-) delete mode 100644 scripts/dockerfiles/README.md delete mode 100755 scripts/dockerfiles/build.sh delete mode 100644 scripts/dockerfiles/images/gogits/Dockerfile delete mode 100644 scripts/dockerfiles/images/gogits/deploy.sh delete mode 100644 scripts/dockerfiles/images/memcache/.gitkeep delete mode 100644 scripts/dockerfiles/images/memcache/Dockerfile delete mode 100644 scripts/dockerfiles/images/mysql/.gitkeep delete mode 100644 scripts/dockerfiles/images/mysql/Dockerfile delete mode 100644 scripts/dockerfiles/images/postgres/.gitkeep delete mode 100644 scripts/dockerfiles/images/postgres/Dockerfile delete mode 100644 scripts/dockerfiles/images/redis/.gitkeep delete mode 100644 scripts/dockerfiles/images/redis/Dockerfile delete mode 100755 scripts/dockerfiles/run.sh diff --git a/README.md b/README.md index a2aed3afa..e85aaf72a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Gogs - Go Git Service [![wercker status](https://app.wercker.com/status/ad0bdb0bc450ac6f09bc56b9640a50aa/s/ "wercker status")](https://app.wercker.com/project/bykey/ad0bdb0bc450ac6f09bc56b9640a50aa) [![Build Status](https://drone.io/github.com/gogits/gogs/status.png)](https://drone.io/github.com/gogits/gogs/latest) +Gogs - Go Git Service [![wercker status](https://app.wercker.com/status/ad0bdb0bc450ac6f09bc56b9640a50aa/s/ "wercker status")](https://app.wercker.com/project/bykey/ad0bdb0bc450ac6f09bc56b9640a50aa) [![Build Status](https://drone.io/github.com/gogits/gogs/status.png)](https://drone.io/github.com/gogits/gogs/latest) ===================== Gogs(Go Git Service) is a painless self-hosted Git Service written in Go. diff --git a/gogs.go b/gogs.go index a5d9a49f8..e7bbb0187 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.5.4.0927 Beta" +const APP_VER = "0.5.4.0928 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) @@ -38,6 +38,5 @@ func main() { cmd.CmdCert, } app.Flags = append(app.Flags, []cli.Flag{}...) - println(runtime.Version()) app.Run(os.Args) } diff --git a/scripts/dockerfiles/README.md b/scripts/dockerfiles/README.md deleted file mode 100644 index a3e18c8b5..000000000 --- a/scripts/dockerfiles/README.md +++ /dev/null @@ -1,56 +0,0 @@ -### Install Gogs With Docker - -Deploying gogs using [Docker](http://www.docker.io/) is as easy as pie. Simple -open the `/dockerfiles/build.sh` file and replace the initial configuration -settings: - -``` -DB_TYPE="YOUR_DB_TYPE" # type of database, supports either 'mysql' or 'postgres' -MEM_TYPE="YOUR_MEM_TYPE" # type of memory database, supports either 'redis' or 'memcache' -DB_PASSWORD="YOUR_DB_PASSWORD" # The database password -DB_RUN_NAME="YOUR_DB_RUN_NAME" # The --name option value to use when running the database image -MEM_RUN_NAME="YOUR_MEM_RUN_NAME" # The --name option value to use when running the memory database image -HOST_PORT="YOUR_HOST_PORT" # The port to expose the app on (redirected to 3000 inside the gogs container) -``` - -And run: -``` -cd dockerfiles -./build.sh -``` - -The build will take some time, just be patient. After it finishes, it will -display a message that looks like this (the content may be different, depending -on your configuration options): - -``` -Now we have the MySQL image(running) and gogs image, use the follow command to start gogs service: -docker run -i -t --link YOUR_DB_RUN_NAME:db --link YOUR_MEM_RUN_NAME:mem -p YOUR_HOST_PORT:3000 gogits/gogs -``` - -To run the container, just copy the above command: - -``` -docker run -i -t --link YOUR_DB_RUN_NAME:db --link YOUR_MEM_RUN_NAME:mem -p YOUR_HOST_PORT:3000 gogits/gogs -``` - -Now gogs should be running! Open your browser and navigate to: - -``` -http://YOUR_HOST_IP:YOUR_HOST_PORT -``` - -During the installation procedure, use the following information: - -- The database type should be whichever `DB_TYPE` you selected above - -- The database host should be either `db:5432` or `db:3306` for PostgreSQL and - MySQL respectively - -- The `RUN_USER` should be whichever user you're running the container with. - Ideally that's `git`, but your individual configuration may vary - -- Everything else is configured like a normal gogs installation - -Let's 'gogs'! -Ouya~ diff --git a/scripts/dockerfiles/build.sh b/scripts/dockerfiles/build.sh deleted file mode 100755 index 36f6a468a..000000000 --- a/scripts/dockerfiles/build.sh +++ /dev/null @@ -1,77 +0,0 @@ -# Configs of the docker images, you might have specify your own configs here. - -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="" - -# fail immediately if anything goes wrong -set -e - -DOCKER_BIN=$(which docker.io || which docker) -if [ -z "$DOCKER_BIN" ] ; then - echo "Please install docker. You can install docker by running \"wget -qO- https://get.docker.io/ | sh\"." - exit 1 -fi - -# 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_BIN build -t gogits/$MEM_TYPE . - $DOCKER_BIN 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_BIN build -t gogits/$DB_TYPE . -# - - -## Build the gogits image -cd ../gogits - -$DOCKER_BIN 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_BIN 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_BIN run -i -t --link $DB_RUN_NAME:db $MEM_LINK -p $HOST_PORT:3000 gogits/gogs \033[0m" - diff --git a/scripts/dockerfiles/images/gogits/Dockerfile b/scripts/dockerfiles/images/gogits/Dockerfile deleted file mode 100644 index 9f2c58ae2..000000000 --- a/scripts/dockerfiles/images/gogits/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM stackbrew/ubuntu:13.10 -MAINTAINER Meaglith Ma (@genedna) - -#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 -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 sudo - -RUN curl -sL https://golang.org/dl/go1.3.linux-amd64.tar.gz | tar -v -C /usr/local -xz -RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1 - -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 - - -# Add the deploy script to the docker image and assign execution permission to it. -ADD ./deploy.sh / -RUN chmod +x deploy.sh - -EXPOSE 3000 - -CMD /deploy.sh diff --git a/scripts/dockerfiles/images/gogits/deploy.sh b/scripts/dockerfiles/images/gogits/deploy.sh deleted file mode 100644 index 4f7e7a5b0..000000000 --- a/scripts/dockerfiles/images/gogits/deploy.sh +++ /dev/null @@ -1,60 +0,0 @@ -# deploy.sh in gogits image, replace the configs and run gogs - -## Replace the database password -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 [ $MEM_TYPE != "" ] - then - 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 -# DB_PORT_3306_TCP_PORT=3306 -# DB_PORT_3306_TCP_PROTO=tcp -# DB_PORT_3306_TCP_ADDR=172.17.0.2 -#sed -i "/HOST = 127.0.0.1:3306/c\HOST = $DB_PORT_3306_TCP_ADDR:$DB_PORT_3306_TCP_PORT" $GOPATH/src/github.com/gogits/gogs/conf/app.ini -sed -i "/HOST = 127.0.0.1:3306/c\HOST = `echo $DB_PORT | cut -d '/' -f 3`" $GOPATH/src/github.com/gogits/gogs/conf/app.ini - -cd $GOPATH/src/github.com/gogits/gogs/ - -# The sudo is a must here, or the go within docker container won't get the current user by os.Getenv("USERNAME") -sudo ./gogs web diff --git a/scripts/dockerfiles/images/memcache/.gitkeep b/scripts/dockerfiles/images/memcache/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/scripts/dockerfiles/images/memcache/Dockerfile b/scripts/dockerfiles/images/memcache/Dockerfile deleted file mode 100644 index d3a54d954..000000000 --- a/scripts/dockerfiles/images/memcache/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM ubuntu - -# Set the file maintainer (your name - the file's author) -MAINTAINER Borja Burgos - -# 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 - diff --git a/scripts/dockerfiles/images/mysql/.gitkeep b/scripts/dockerfiles/images/mysql/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/scripts/dockerfiles/images/mysql/Dockerfile b/scripts/dockerfiles/images/mysql/Dockerfile deleted file mode 100644 index bbf5c0a83..000000000 --- a/scripts/dockerfiles/images/mysql/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -#FROM stackbrew/ubuntu:13.10 -#FROM stackbrew/ubuntu -FROM stackbrew/ubuntu:saucy -MAINTAINER Meaglith Ma (@genedna) - -RUN apt-get install -y --force-yes software-properties-common -RUN add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) universe" -RUN apt-get --yes --force-yes update -RUN apt-get --yes --force-yes upgrade - -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 - -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 service mysql restart - -RUN echo "mysql -uroot -p$MYSQL_PASSWORD -e 'drop database if exists gogs;'" >> import.sh -RUN echo "mysql -uroot -p$MYSQL_PASSWORD -e 'create database gogs;'" >> import.sh -RUN chmod +x import.sh - -RUN apt-get autoremove -y -RUN apt-get clean all - -RUN /usr/sbin/mysqld & \ - sleep 10s &&\ - echo "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '$MYSQL_PASSWORD' WITH GRANT OPTION; FLUSH PRIVILEGES" | mysql -p$MYSQL_PASSWORD &&\ - ./import.sh - -EXPOSE 3306 - -CMD ["/usr/bin/mysqld_safe", "--skip-syslog", "--log-error=/dev/null"] diff --git a/scripts/dockerfiles/images/postgres/.gitkeep b/scripts/dockerfiles/images/postgres/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/scripts/dockerfiles/images/postgres/Dockerfile b/scripts/dockerfiles/images/postgres/Dockerfile deleted file mode 100644 index 793499922..000000000 --- a/scripts/dockerfiles/images/postgres/Dockerfile +++ /dev/null @@ -1,50 +0,0 @@ -FROM ubuntu -MAINTAINER SvenDowideit@docker.com - -# 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 - -# Add PostgreSQL's repository. It contains the most recent stable release -# of PostgreSQL, ``9.3``. -# See http://apt.postgresql.org/pub/repos/apt/README -RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list - -# Update the Ubuntu and PostgreSQL repository indexes -RUN apt-get update - -# Install ``python-software-properties``, ``software-properties-common`` and PostgreSQL 9.3 -# There are some warnings (in red) that show up during the build. You can hide -# them by prefixing each apt-get statement with DEBIAN_FRONTEND=noninteractive -RUN apt-get -y -q install python-software-properties software-properties-common -RUN apt-get -y -q install postgresql-9.3 postgresql-client-9.3 postgresql-contrib-9.3 - -# Note: The official Debian and Ubuntu images automatically ``apt-get clean`` -# after each ``apt-get`` - -# Run the rest of the commands as the ``postgres`` user created by the ``postgres-9.3`` package when it was ``apt-get installed`` -USER postgres - -# Create a PostgreSQL role named ``docker`` with ``docker`` as the password and -# then create a database `docker` owned by the ``docker`` role. -# Note: here we use ``&&\`` to run commands one after the other - the ``\`` -# allows the RUN command to span multiple lines. -RUN /etc/init.d/postgresql start &&\ - psql --command "CREATE USER root WITH SUPERUSER PASSWORD 'THE_DB_PASSWORD';" &&\ - createdb -O root gogs - -# Adjust PostgreSQL configuration so that remote connections to the -# database are possible. -RUN echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/9.3/main/pg_hba.conf - -# And add ``listen_addresses`` to ``/etc/postgresql/9.3/main/postgresql.conf`` -RUN echo "listen_addresses='*'" >> /etc/postgresql/9.3/main/postgresql.conf - -# Expose the PostgreSQL port -EXPOSE 5432 - -# Add VOLUMEs to allow backup of config, logs and databases -VOLUME ["/etc/postgresql", "/var/log/postgresql", "/var/lib/postgresql"] - -# Set the default command to run when starting the container -CMD ["/usr/lib/postgresql/9.3/bin/postgres", "-D", "/var/lib/postgresql/9.3/main", "-c", "config_file=/etc/postgresql/9.3/main/postgresql.conf"] diff --git a/scripts/dockerfiles/images/redis/.gitkeep b/scripts/dockerfiles/images/redis/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/scripts/dockerfiles/images/redis/Dockerfile b/scripts/dockerfiles/images/redis/Dockerfile deleted file mode 100644 index a5b948fb1..000000000 --- a/scripts/dockerfiles/images/redis/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM stackbrew/ubuntu:saucy -MAINTAINER Meaglith Ma (@genedna), Lance Ju (@crystaldust) - -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"] - diff --git a/scripts/dockerfiles/run.sh b/scripts/dockerfiles/run.sh deleted file mode 100755 index cef2ebb81..000000000 --- a/scripts/dockerfiles/run.sh +++ /dev/null @@ -1,19 +0,0 @@ -# Configs -MYSQL_PASSWORD="kuajie8402" -MYSQL_RUN_NAME="gogs_mysql" -typeset -u MYSQL_ALIAS -MYSQL_ALIAS="db" -HOST_PORT="3000" - -DOCKER_BIN=$(which docker.io || which docker) -if [ -z "$DOCKER_BIN" ] ; then - echo "Please install docker. You can install docker by running \"wget -qO- https://get.docker.io/ | sh\"." - exit 1 -fi - -## Run MySQL image with name -$DOCKER_BIN run -d --name $MYSQL_RUN_NAME gogs/mysql -# -## Run gogits image and link it to the MySQL image -$DOCKER_BIN run --link $MYSQL_RUN_NAME:$MYSQL_ALIAS -p $HOST_PORT:3000 gogs/gogits - diff --git a/templates/.VERSION b/templates/.VERSION index cea419d7e..583b3b81b 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.5.4.0927 Beta \ No newline at end of file +0.5.4.0928 Beta \ No newline at end of file