Merge "Build houndd Directly"

docker/hound/Dockerfile

@@ -12,14 +12,26 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM docker.io/opendevorg/python-base:3.9-bullseye
+FROM docker.io/opendevorg/python-base:3.9-bullseye AS builder
+
+WORKDIR /tmp
 
 ENV GOPATH /go
 
 RUN apt-get update \
-    && apt-get install -y curl golang git
+    && apt-get install -y curl golang git make npm rsync
 
-RUN go get github.com/hound-search/hound/cmds/...
+RUN git clone https://github.com/hound-search/hound \
+    && cd hound \
+    && make
+
+FROM docker.io/opendevorg/python-base:3.9-bullseye 
+
+COPY --from=builder /tmp/hound/.build/bin/hound /usr/local/bin
+COPY --from=builder /tmp/hound/.build/bin/houndd /usr/local/bin
+
+RUN apt-get update \
+    && apt-get install -y curl git
 
 RUN pip install git+https://opendev.org/opendev/jeepyb#egg=jeepyb \
  supervisor

docker/hound/supervisord.conf

@@ -11,7 +11,7 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
 [program:houndd]
 directory=/var/run
-command=/go/bin/houndd -conf /var/run/config.json
+command=/usr/local/bin/houndd -conf /var/run/config.json
 logfile_maxbytes=0
 stdout_logfile_maxbytes=0
 stderr_logfile_maxbytes=0