Update Hound Container to Debian Trixie
Much of the motivation here is to exercise the Trixie containers before we deploy Gerrit on them. That said it is a good opportunity to update hound to run on newer platforms like node 22 as well. We update the nodesource repo to use the new nodistro release as Trixie doesn't have a release entry in the old repo setup. Then we bump up to node 22 to match gitea. Finally, we update the golang build version as the upstream golang images don't build golang older than 1.24 on Trixie. We go with latest (1.25) under the hopes it will work, but we can try 1.24 if 1.25 doesn't work. Change-Id: Idcfd2e5880f17c1d4062e8d17036d3b21422a53a
This commit is contained in:
@@ -15,22 +15,22 @@
|
||||
|
||||
# Trigger rebuild - Wed Apr 23 05:03:23 PM UTC 2025
|
||||
|
||||
FROM docker.io/library/golang:1.19-bookworm AS builder
|
||||
FROM docker.io/library/golang:1.25-trixie 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 bookworm main" | tee /etc/apt/sources.list.d/nodesource.list \
|
||||
&& curl -sS https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key -o /etc/apt/keyrings/nodesource-repo.gpg.key \
|
||||
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource-repo.gpg.key] https://deb.nodesource.com/node_22.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
|
||||
&& apt-get update \
|
||||
&& apt-get -q --option "Dpkg::Options::=--force-confold" --assume-yes install nodejs npm
|
||||
&& 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 quay.io/opendevorg/python-base:3.12-bookworm
|
||||
FROM quay.io/opendevorg/python-base:3.12-trixie
|
||||
|
||||
COPY --from=builder /tmp/hound/.build/bin/hound /usr/local/bin
|
||||
COPY --from=builder /tmp/hound/.build/bin/houndd /usr/local/bin
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
- job:
|
||||
name: system-config-build-image-hound
|
||||
description: Build a hound image.
|
||||
requires: python-base-3.12-bookworm-container-image
|
||||
requires: python-base-3.12-trixie-container-image
|
||||
provides: hound-container-image
|
||||
parent: system-config-build-container-image
|
||||
vars: &hound_vars
|
||||
@@ -21,7 +21,7 @@
|
||||
- job:
|
||||
name: system-config-upload-image-hound
|
||||
description: Build and upload a hound image.
|
||||
requires: python-base-3.12-bookworm-container-image
|
||||
requires: python-base-3.12-trixie-container-image
|
||||
provides: hound-container-image
|
||||
parent: system-config-upload-container-image
|
||||
vars: *hound_vars
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
- system-config-build-image-hound:
|
||||
dependencies:
|
||||
- name: opendev-buildset-registry
|
||||
- name: system-config-build-image-python-base-3.12-bookworm
|
||||
- name: system-config-build-image-python-base-3.12-trixie
|
||||
soft: true
|
||||
- system-config-build-image-etherpad
|
||||
- system-config-build-image-mailman
|
||||
@@ -238,7 +238,7 @@
|
||||
- system-config-upload-image-hound:
|
||||
dependencies:
|
||||
- name: opendev-buildset-registry
|
||||
- name: system-config-build-image-python-base-3.12-bookworm
|
||||
- name: system-config-build-image-python-base-3.12-trixie
|
||||
soft: true
|
||||
- system-config-upload-image-assets
|
||||
- system-config-upload-image-etherpad
|
||||
|
||||
Reference in New Issue
Block a user