From 7d81296c8322c27ba793fc1cd58780e68f9608c9 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 4 May 2023 08:15:44 -0700 Subject: [PATCH] Align hound image build with Gitea's Gitea is built using the library/golang base image published on docker hub. We were building Hound with the golang found in Debian's package repos. Let's sync these two up so that they build in a more similar manner. Change-Id: Ic171b12dd4ed504e751857d05598333023d2113d --- docker/hound/Dockerfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/docker/hound/Dockerfile b/docker/hound/Dockerfile index 7af0f06468..ce00e895fc 100644 --- a/docker/hound/Dockerfile +++ b/docker/hound/Dockerfile @@ -12,20 +12,23 @@ # implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM docker.io/opendevorg/python-base:3.11-bullseye AS builder + +FROM docker.io/library/golang:1.19-bullseye AS builder WORKDIR /tmp -ENV GOPATH /go - RUN apt-get update \ - && apt-get install -y curl golang git make npm rsync + && apt-get install -y curl git make rsync \ + && curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ + && echo "deb https://deb.nodesource.com/node_16.x bullseye main" | tee /etc/apt/sources.list.d/nodesource.list \ + && apt-get update \ + && apt-get -q --option "Dpkg::Options::=--force-confold" --assume-yes install nodejs RUN git clone https://github.com/hound-search/hound \ && cd hound \ && make -FROM docker.io/opendevorg/python-base:3.11-bullseye +FROM docker.io/opendevorg/python-base:3.11-bullseye COPY --from=builder /tmp/hound/.build/bin/hound /usr/local/bin COPY --from=builder /tmp/hound/.build/bin/houndd /usr/local/bin