diff options
| author | Unknwon <joe2010xtmf@163.com> | 2014-08-31 15:11:55 +0800 |
|---|---|---|
| committer | Unknwon <joe2010xtmf@163.com> | 2014-08-31 15:11:55 +0800 |
| commit | 7e36bf448db915250eb831a00b122fc1092df630 (patch) | |
| tree | f3e590a542497efd1908109f752e7a03a8abeca4 /scripts | |
| parent | d78008b546b74d528629b79a7fee00b20f3437e2 (diff) | |
| parent | 03c6a395aa0d32c99e8264d18a3b5228656478df (diff) | |
| download | gitea-7e36bf448db915250eb831a00b122fc1092df630.tar.gz gitea-7e36bf448db915250eb831a00b122fc1092df630.zip | |
Merge branch 'master' of github.com:gogits/gogs into dev
Conflicts:
dockerfiles/README.md
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/dockerfiles/images/gogits/Dockerfile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/scripts/dockerfiles/images/gogits/Dockerfile b/scripts/dockerfiles/images/gogits/Dockerfile index bda9e424dd..9f2c58ae25 100644 --- a/scripts/dockerfiles/images/gogits/Dockerfile +++ b/scripts/dockerfiles/images/gogits/Dockerfile @@ -19,9 +19,6 @@ 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 -# Clean all the unused packages -RUN apt-get autoremove -y -RUN apt-get clean all # Add the deploy script to the docker image and assign execution permission to it. ADD ./deploy.sh / |