Shorten dockerfiles (since they build fine)
This commit is contained in:
parent
fd4bc4a3f3
commit
0560f22997
|
@ -4,12 +4,8 @@ LABEL app="brubeck"
|
|||
LABEL github="https://github.com/github/brubeck"
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
RUN apt-get update
|
||||
RUN apt-get install -y libjansson-dev
|
||||
RUN apt-get install -y libssl-dev
|
||||
RUN apt-get install -y libmicrohttpd-dev
|
||||
RUN apt-get install -y git
|
||||
RUN apt-get install -y make
|
||||
RUN apt-get update && apt-get -y upgrade
|
||||
RUN apt-get install -y make git libjansson-dev libssl-dev libmicrohttpd-dev
|
||||
|
||||
RUN mkdir /build
|
||||
RUN cd /build && git clone https://github.com/github/brubeck.git
|
||||
|
|
|
@ -5,7 +5,8 @@ LABEL version="0.7.2"
|
|||
LABEL github="https://github.com/lomik/go-carbon"
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
RUN apt-get update && apt-get install -y make git golang
|
||||
RUN apt-get update && apt-get -y upgrade
|
||||
RUN apt-get install -y make git golang
|
||||
|
||||
RUN mkdir /build
|
||||
RUN cd /build && git clone https://github.com/lomik/go-carbon.git
|
||||
|
|
|
@ -5,19 +5,25 @@ LABEL version="3.1.0-beta1"
|
|||
LABEL github="https://github.com/grafana/grafana"
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
RUN apt-get update
|
||||
RUN apt-get -y upgrade
|
||||
RUN apt-get update && apt-get -y upgrade
|
||||
RUN apt-get install -y curl make git build-essential
|
||||
|
||||
# Installing Node.js
|
||||
RUN curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
|
||||
RUN apt-get install -y nodejs && node -v && npm -v
|
||||
|
||||
# Installing Go
|
||||
RUN cd /tmp && curl -O https://storage.googleapis.com/golang/go1.6.linux-amd64.tar.gz
|
||||
WORKDIR /tmp
|
||||
RUN tar -xvf go1.6.linux-amd64.tar.gz
|
||||
RUN mv go /usr/local
|
||||
RUN mkdir /go
|
||||
# Setting up Go environment
|
||||
ENV PATH $PATH:/usr/local/go/bin:/go/bin
|
||||
ENV GOPATH /go
|
||||
RUN go version
|
||||
RUN go env
|
||||
RUN go version && go env
|
||||
|
||||
# Building Grafana
|
||||
|
||||
RUN go get -d -v github.com/grafana/grafana || true
|
||||
WORKDIR /go/src/github.com/grafana/grafana
|
||||
|
@ -28,10 +34,6 @@ RUN rm -rf Godeps/_workspace
|
|||
RUN godep restore
|
||||
RUN go run build.go build
|
||||
|
||||
RUN curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
|
||||
RUN apt-get install -y nodejs
|
||||
RUN node -v
|
||||
RUN npm -v
|
||||
RUN npm install
|
||||
RUN npm run build
|
||||
|
||||
|
|
Loading…
Reference in New Issue