From 6dff5cd19ed6f530b9525f17991c8ea693b22b5e Mon Sep 17 00:00:00 2001 From: "Randy D. Wallace Jr" Date: Wed, 2 Oct 2013 04:44:02 +0000 Subject: [PATCH 1/3] Update Dockerfile to build dockerui.go --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index dec150fae..1b59d7aec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Dockerfile for DockerUI -FROM ubuntu +FROM ubuntu:12.04 MAINTAINER Michael Crosby http://crosbymichael.com @@ -10,7 +10,9 @@ RUN apt-get upgrade -y ADD . /app/ -EXPOSE 9000 WORKDIR /app/ +RUN apt-get install -y golang-go && go build dockerui.go + +EXPOSE 9000 ENTRYPOINT ["./dockerui"] From cf018763bc8619cb2c581dbfd49b5a0fddbbe070 Mon Sep 17 00:00:00 2001 From: "Randy D. Wallace Jr" Date: Wed, 2 Oct 2013 18:31:47 +0000 Subject: [PATCH 2/3] Update Dockerfile to pull go from googlecode --- Dockerfile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1b59d7aec..204262c00 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,15 +4,25 @@ FROM ubuntu:12.04 MAINTAINER Michael Crosby http://crosbymichael.com -RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list RUN apt-get update RUN apt-get upgrade -y +ADD https://go.googlecode.com/files/go1.1.2.linux-amd64.tar.gz /opt/go.tar.gz + +RUN \ + cd /opt ;\ + tar xvvf go.tar.gz ;\ + rm go.tar.gz ;\ + ln -s /opt/go/bin/go /usr/local/bin/go ;\ +#RUN + +ENV GOROOT /opt/go + ADD . /app/ WORKDIR /app/ -RUN apt-get install -y golang-go && go build dockerui.go +RUN go build dockerui.go EXPOSE 9000 ENTRYPOINT ["./dockerui"] From 302e88cc782aba9b17bc6afb6a46bbc2bd14f496 Mon Sep 17 00:00:00 2001 From: "Randy D. Wallace Jr" Date: Thu, 3 Oct 2013 02:50:08 +0000 Subject: [PATCH 3/3] Moved go installation to RUN from ADD --- Dockerfile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 204262c00..079869abf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,16 +7,13 @@ MAINTAINER Michael Crosby http://crosbymichael.com RUN apt-get update RUN apt-get upgrade -y -ADD https://go.googlecode.com/files/go1.1.2.linux-amd64.tar.gz /opt/go.tar.gz - -RUN \ - cd /opt ;\ - tar xvvf go.tar.gz ;\ - rm go.tar.gz ;\ - ln -s /opt/go/bin/go /usr/local/bin/go ;\ +RUN apt-get install -y curl ;\ + curl -s https://go.googlecode.com/files/go1.1.2.linux-amd64.tar.gz | tar -v -C /opt -xz ;\ + cp -a /opt/go/* /usr/local/ ;\ + rm -rf /opt/go ;\ #RUN -ENV GOROOT /opt/go +ENV GOROOT /usr/local/ ADD . /app/