Merge branch 'dev' of github.com:gogits/gogs into dev
This commit is contained in:
commit
2369881808
|
@ -4,7 +4,7 @@ FROM ubuntu:14.04
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
build-essential ca-certificates curl \
|
build-essential ca-certificates curl \
|
||||||
bzr git mercurial \
|
bzr git mercurial openssh-client\
|
||||||
--no-install-recommends
|
--no-install-recommends
|
||||||
|
|
||||||
ENV GOLANG_VERSION 1.3
|
ENV GOLANG_VERSION 1.3
|
||||||
|
|
|
@ -5,7 +5,7 @@ FROM ubuntu:14.04
|
||||||
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
|
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
|
||||||
apt-get install -qy \
|
apt-get install -qy \
|
||||||
build-essential ca-certificates curl \
|
build-essential ca-certificates curl \
|
||||||
bzr git mercurial \
|
bzr git mercurial openssh-client\
|
||||||
--no-install-recommends
|
--no-install-recommends
|
||||||
|
|
||||||
ENV GOLANG_VERSION 1.3
|
ENV GOLANG_VERSION 1.3
|
||||||
|
|
Reference in a new issue