d56d5fb080
The last rebuild only promoted our Gerrit 3.8 image. This appears to have happened because we only modified the jobs and not the Dockerfile itself. Fix this by modifying the Dockerfile which should rebuild and promote both 3.8 and 3.9 images ensuring that our upgrade testing tests what we want to upgrade to. Change-Id: I8d06ea9971a6ee0c0e06e6fe2b73391526be6220
81 lines
2.7 KiB
Docker
81 lines
2.7 KiB
Docker
# Copyright (c) 2019 Red Hat, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
# implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
# Mon May 6 04:52:14 PM UTC 2024 - trigger rebuild
|
|
|
|
FROM docker.io/opendevorg/python-builder:3.11-bookworm as builder
|
|
|
|
COPY . /tmp/src
|
|
RUN assemble
|
|
|
|
FROM docker.io/opendevorg/python-base:3.11-bookworm as gerrit-base
|
|
|
|
RUN echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/95disable-recommends
|
|
|
|
RUN apt-get update \
|
|
&& apt-get install -y dumb-init git openssh-client openjdk-17-jdk-headless unzip \
|
|
# This next set of installs helps align us with the old openjdk image \
|
|
# but they may not all be necessary \
|
|
&& apt-get install -y xz-utils bzip2 wget curl gnupg \
|
|
&& apt-get clean \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
COPY --from=builder /output/ /output
|
|
RUN /output/install-from-bindep
|
|
|
|
# 3000 is what the existing opendev gerrit2 uid is
|
|
RUN addgroup gerrit --gid 3000 --system \
|
|
&& adduser \
|
|
--system \
|
|
--uid 3000 \
|
|
--home /var/gerrit \
|
|
--shell /bin/bash \
|
|
--ingroup gerrit \
|
|
gerrit
|
|
|
|
# Startup scripts
|
|
COPY wait-for-it.sh /wait-for-it.sh
|
|
RUN chmod +x /wait-for-it.sh
|
|
COPY run-gerrit.sh /run-gerrit.sh
|
|
RUN chmod +x /run-gerrit.sh
|
|
|
|
USER gerrit
|
|
RUN mkdir /var/gerrit/bin \
|
|
&& mkdir /var/gerrit/hooks \
|
|
&& mkdir /var/gerrit/static
|
|
|
|
# Download mariadb java client.
|
|
# Modern gerrit stopped downloading missing libs during init which means we
|
|
# need to do the downland and install ourselves.
|
|
# Note the perms on this are 0600 hence the need for the chown otherwise
|
|
# they are root owned and Gerrit can't use the jdbc driver.
|
|
ADD --chown=gerrit:gerrit https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/2.7.2/mariadb-java-client-2.7.2.jar /var/gerrit/lib/mariadb-java-client.jar
|
|
|
|
# Allow incoming traffic
|
|
# OpenDev Gerrit listens on 8081 not default of 8080
|
|
EXPOSE 29418 8081
|
|
|
|
VOLUME /var/gerrit/git /var/gerrit/index /var/gerrit/cache /var/gerrit/db /var/gerrit/etc /var/log/gerrit /var/gerrit/tmp /var/gerrit/data
|
|
|
|
RUN ln -s /var/log/gerrit /var/gerrit/logs
|
|
|
|
# container.javaOptions
|
|
# Also include container.heapLimit - but with -Xmx prefixing it
|
|
ENV JAVA_OPTIONS ""
|
|
|
|
# Ulimits should be set on command line or in docker-compose.yaml
|
|
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
|
|
CMD "/run-gerrit.sh"
|