Merge pull request #654 from aleksandra-malinowska/cherry-pick-update-dockerfiles-1.1
Use Debian image
This commit is contained in:
commit
9fbe337c68
|
|
@ -12,19 +12,11 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
FROM gcr.io/google-containers/ubuntu-slim:0.8
|
FROM golang:1.8.3
|
||||||
MAINTAINER Marcin Wielgus "mwielgus@google.com"
|
LABEL maintainer="Marcin Wielgus <mwielgus@google.com>"
|
||||||
|
|
||||||
RUN apt-get update && apt-get install --yes git wget make gcc libseccomp-dev \
|
|
||||||
&& apt-get clean \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
RUN wget https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz \
|
|
||||||
&& tar -xvf go1.8.3.linux-amd64.tar.gz \
|
|
||||||
&& rm go1.8.3.linux-amd64.tar.gz
|
|
||||||
|
|
||||||
ENV GOROOT /go
|
|
||||||
ENV GOPATH /gopath/
|
ENV GOPATH /gopath/
|
||||||
ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
|
ENV PATH $GOPATH/bin:$PATH
|
||||||
RUN go version
|
RUN go version
|
||||||
RUN go get github.com/tools/godep
|
RUN go get github.com/tools/godep
|
||||||
RUN godep version
|
RUN godep version
|
||||||
|
|
|
||||||
|
|
@ -12,12 +12,11 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
FROM gcr.io/google-containers/ubuntu-slim:0.8
|
FROM gcr.io/google-containers/debian-base-amd64:0.3
|
||||||
MAINTAINER Marcin Wielgus "mwielgus@google.com"
|
LABEL maintainer="Marcin Wielgus <mwielgus@google.com>"
|
||||||
|
|
||||||
RUN apt-get update && apt-get install --yes ca-certificates \
|
ENV DEBIAN_FRONTEND noninteractive
|
||||||
&& apt-get clean \
|
RUN clean-install ca-certificates
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
ADD cluster-autoscaler cluster-autoscaler
|
ADD cluster-autoscaler cluster-autoscaler
|
||||||
ADD run.sh run.sh
|
ADD run.sh run.sh
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue