From 55abbf33bfc97b4e190799dfdf38ab2eaaeaaad8 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Thu, 24 Aug 2023 10:40:21 -0700
Subject: [PATCH] Update hound image to bookworm
Change-Id: I51b8630b27149aa96c63d13d6fae240c5c81cd96
---
docker/hound/Dockerfile | 8 ++++----
zuul.d/docker-images/hound.yaml | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docker/hound/Dockerfile b/docker/hound/Dockerfile
index ce00e895fc..4338e0dcc1 100644
--- a/docker/hound/Dockerfile
+++ b/docker/hound/Dockerfile
@@ -13,22 +13,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM docker.io/library/golang:1.19-bullseye AS builder
+FROM docker.io/library/golang:1.19-bookworm AS builder
WORKDIR /tmp
RUN apt-get update \
&& 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 \
+ && echo "deb https://deb.nodesource.com/node_16.x bookworm main" | tee /etc/apt/sources.list.d/nodesource.list \
&& apt-get update \
- && apt-get -q --option "Dpkg::Options::=--force-confold" --assume-yes install nodejs
+ && apt-get -q --option "Dpkg::Options::=--force-confold" --assume-yes install nodejs npm
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-bookworm
COPY --from=builder /tmp/hound/.build/bin/hound /usr/local/bin
COPY --from=builder /tmp/hound/.build/bin/houndd /usr/local/bin
diff --git a/zuul.d/docker-images/hound.yaml b/zuul.d/docker-images/hound.yaml
index d91955c71f..dd19aaa171 100644
--- a/zuul.d/docker-images/hound.yaml
+++ b/zuul.d/docker-images/hound.yaml
@@ -2,7 +2,7 @@
- job:
name: system-config-build-image-hound
description: Build a hound image.
- requires: python-base-3.11-bullseye-container-image
+ requires: python-base-3.11-bookworm-container-image
provides: hound-container-image
parent: system-config-build-image
vars: &hound_vars
@@ -15,7 +15,7 @@
- job:
name: system-config-upload-image-hound
description: Build and upload a hound image.
- requires: python-base-3.11-bullseye-container-image
+ requires: python-base-3.11-bookworm-container-image
provides: hound-container-image
parent: system-config-upload-image
vars: *hound_vars