From 58edcbb3dffe24e359d353b6ef060fc99d2f5644 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 21 Apr 2023 14:50:51 +1000 Subject: [PATCH] Build houndd Directly The UI bits for hound isn't rebuild properly upstream, causing some overlay issues with advance option. In this patch, we build the houndd from scratch to fix this issue. Ian filed a PR upstream at https://github.com/hound-search/hound/pull/456 Change-Id: Ia00dee2035b9785bd911c3724b0249cefbed3f57 --- docker/hound/Dockerfile | 18 +++++++++++++++--- docker/hound/supervisord.conf | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/docker/hound/Dockerfile b/docker/hound/Dockerfile index 376f76f4fb..88f7d8b2e4 100644 --- a/docker/hound/Dockerfile +++ b/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 diff --git a/docker/hound/supervisord.conf b/docker/hound/supervisord.conf index d19316792e..ba386885aa 100644 --- a/docker/hound/supervisord.conf +++ b/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