Merge pull request #2335 from bacongobbler/replace_bash_parts_with_go

ref(builder): remove python and jq from the builder script

Author: Matthew Fisher

builder/Dockerfile

@@ -1,71 +1,19 @@
-FROM ubuntu-debootstrap:14.04
+FROM golang:1.3
 
-ENV DEBIAN_FRONTEND noninteractive
+# install dependencies
+RUN go get github.com/tools/godep
 
-# install common packages
-RUN apt-get update && apt-get install -y curl net-tools sudo
+RUN mkdir -p /go/bin
 
-# install etcdctl
-RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdemand/etcdctl-v0.4.6 \
-    && chmod +x /usr/local/bin/etcdctl
+COPY . /go/src/github.com/deis/deis/builder
 
-# install confd
-RUN curl -sSL -o /usr/local/bin/confd https://s3-us-west-2.amazonaws.com/opdemand/confd-v0.5.0-json \
-    && chmod +x /usr/local/bin/confd
+WORKDIR /go/src/github.com/deis/deis/builder
 
-# install docker-in-docker
-RUN echo "deb http://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
-
-# install builder, docker, and hook dependencies
-RUN apt-get update && apt-get install -yq \
-    openssh-server git \
-    aufs-tools iptables lxc \
-    lxc-docker-1.3.2
-
-# install jq for parsing json
-RUN curl http://stedolan.github.io/jq/download/linux64/jq > /usr/bin/jq && chmod 755 /usr/bin/jq
-
-# configure ssh server
-RUN rm /etc/ssh/ssh_host_*
-RUN dpkg-reconfigure openssh-server
-RUN mkdir -p /var/run/sshd
-
-# install pip
-RUN curl -sSL https://raw.githubusercontent.com/pypa/pip/1.5.6/contrib/get-pip.py | python -
-
-# install hook dependencies
-RUN pip install pyyaml==3.11 requests==2.4.3
-
-# configure locale
-RUN echo LANG="en_US.UTF-8" > /etc/default/locale && dpkg-reconfigure locales
-
-# install git and configure gituser
-ENV GITHOME /home/git
-ENV GITUSER git
-RUN useradd -d $GITHOME $GITUSER
-RUN mkdir -p $GITHOME/.ssh && chown git:git $GITHOME/.ssh
-RUN chown -R $GITUSER:$GITUSER $GITHOME
-
-# let the git user run `sudo /home/git/builder` (not writeable)
-RUN echo "%git    ALL=(ALL:ALL) NOPASSWD:/home/git/builder" >> /etc/sudoers
-
-# HACK: import progrium/cedarish as a tarball
-# see https://github.com/deis/deis/issues/1027
-RUN curl -#SL -o /progrium_cedarish.tar \
-    https://s3-us-west-2.amazonaws.com/opdemand/progrium_cedarish_2014_10_01.tar
-
-# define the execution environment
-# use VOLUME to remove /var/lib/docker from copy-on-write for performance
-# we don't want to stack overlay filesystems
-VOLUME /var/lib/docker
-WORKDIR /app
-ENTRYPOINT ["/app/bin/entry"]
-CMD ["/app/bin/boot"]
-EXPOSE 22
-RUN addgroup --quiet --gid 2000 slug && useradd slug --uid=2000 --gid=2000
-
-ADD templates/shim.dockerfile /home/git/
-ADD . /app
-ADD sshd_config /etc/ssh/sshd_config
-RUN chown -R root:root /app
+RUN CGO_ENABLED=0 godep go build -a -ldflags '-s' bin/extract-domain.go && mv extract-domain /go/bin/
+RUN CGO_ENABLED=0 godep go build -a -ldflags '-s' bin/extract-types.go && mv extract-types /go/bin/
+RUN CGO_ENABLED=0 godep go build -a -ldflags '-s' bin/extract-version.go && mv extract-version /go/bin/
+RUN CGO_ENABLED=0 godep go build -a -ldflags '-s' bin/generate-buildhook.go && mv generate-buildhook /go/bin/
+RUN CGO_ENABLED=0 godep go build -a -ldflags '-s' bin/get-app-config.go && mv get-app-config /go/bin/
+RUN CGO_ENABLED=0 godep go build -a -ldflags '-s' bin/get-app-values.go && mv get-app-values /go/bin/
+RUN CGO_ENABLED=0 godep go build -a -ldflags '-s' bin/yaml2json-procfile.go && mv yaml2json-procfile /go/bin/
+RUN CGO_ENABLED=0 godep go build -a -ldflags '-s' bin/publish-release-controller.go && mv publish-release-controller /go/bin/