Install jeepyb into the gerrit images
We need jeepyb installed because the content of the gerrit hook scripts we install is done via jeepyb commands. Use python-builder so that we can just install the jeepyb wheel. Should we maybe transition these hooks into being zuul jobs? Depends-On: https://review.opendev.org/683146/ Change-Id: I8899885b05d1e9f48b3f354ca22b360b54d455a3
This commit is contained in:
parent
f0a3f0cb37
commit
d9fb5b3faf
20
.zuul.yaml
20
.zuul.yaml
@ -458,10 +458,13 @@
|
|||||||
name: system-config-build-image-gerrit-base
|
name: system-config-build-image-gerrit-base
|
||||||
description: Build a gerrit-base image.
|
description: Build a gerrit-base image.
|
||||||
parent: system-config-build-image
|
parent: system-config-build-image
|
||||||
|
required-projects: &gerrit_base_projects
|
||||||
|
- opendev/jeepyb
|
||||||
vars: &gerrit-base_vars
|
vars: &gerrit-base_vars
|
||||||
docker_images:
|
docker_images:
|
||||||
- context: docker/gerrit/base
|
- context: docker/gerrit/base
|
||||||
repository: opendevorg/gerrit-base
|
repository: opendevorg/gerrit-base
|
||||||
|
path: /home/zuul/src/opendev.org/opendev/jeepyb
|
||||||
files: &gerrit-base_files
|
files: &gerrit-base_files
|
||||||
- docker/gerrit/base/.*
|
- docker/gerrit/base/.*
|
||||||
|
|
||||||
@ -469,6 +472,7 @@
|
|||||||
name: system-config-upload-image-gerrit-base
|
name: system-config-upload-image-gerrit-base
|
||||||
description: Build and upload a gerrit-base image.
|
description: Build and upload a gerrit-base image.
|
||||||
parent: system-config-upload-image
|
parent: system-config-upload-image
|
||||||
|
required-projects: *gerrit_base_projects
|
||||||
vars: *gerrit-base_vars
|
vars: *gerrit-base_vars
|
||||||
files: *gerrit-base_files
|
files: *gerrit-base_files
|
||||||
|
|
||||||
@ -476,6 +480,7 @@
|
|||||||
name: system-config-promote-image-gerrit-base
|
name: system-config-promote-image-gerrit-base
|
||||||
description: Promote a previously published gerrit-base image to latest.
|
description: Promote a previously published gerrit-base image to latest.
|
||||||
parent: system-config-promote-image
|
parent: system-config-promote-image
|
||||||
|
required-projects: *gerrit_base_projects
|
||||||
vars: *gerrit-base_vars
|
vars: *gerrit-base_vars
|
||||||
files: *gerrit-base_files
|
files: *gerrit-base_files
|
||||||
|
|
||||||
@ -982,7 +987,10 @@
|
|||||||
- system-config-build-image-jinja-init
|
- system-config-build-image-jinja-init
|
||||||
- system-config-build-image-gitea-init
|
- system-config-build-image-gitea-init
|
||||||
- system-config-build-image-gitea
|
- system-config-build-image-gitea
|
||||||
- system-config-build-image-gerrit-base
|
- system-config-build-image-gerrit-base:
|
||||||
|
dependencies:
|
||||||
|
- name: system-config-build-image-python-builder
|
||||||
|
soft: true
|
||||||
- system-config-build-image-gerrit-2.13
|
- system-config-build-image-gerrit-2.13
|
||||||
- system-config-build-image-gerrit-2.15:
|
- system-config-build-image-gerrit-2.15:
|
||||||
dependencies:
|
dependencies:
|
||||||
@ -1030,7 +1038,10 @@
|
|||||||
- system-config-upload-image-jinja-init
|
- system-config-upload-image-jinja-init
|
||||||
- system-config-upload-image-gitea-init
|
- system-config-upload-image-gitea-init
|
||||||
- system-config-upload-image-gitea
|
- system-config-upload-image-gitea
|
||||||
- system-config-upload-image-gerrit-base
|
- system-config-upload-image-gerrit-base:
|
||||||
|
dependencies:
|
||||||
|
- name: system-config-upload-image-python-builder
|
||||||
|
soft: true
|
||||||
- system-config-upload-image-gerrit-2.13
|
- system-config-upload-image-gerrit-2.13
|
||||||
- system-config-upload-image-gerrit-2.15:
|
- system-config-upload-image-gerrit-2.15:
|
||||||
dependencies:
|
dependencies:
|
||||||
@ -1059,7 +1070,10 @@
|
|||||||
- system-config-promote-image-jinja-init
|
- system-config-promote-image-jinja-init
|
||||||
- system-config-promote-image-gitea-init
|
- system-config-promote-image-gitea-init
|
||||||
- system-config-promote-image-gitea
|
- system-config-promote-image-gitea
|
||||||
- system-config-promote-image-gerrit-base
|
- system-config-promote-image-gerrit-base:
|
||||||
|
dependencies:
|
||||||
|
- name: system-config-promote-image-python-builder
|
||||||
|
soft: true
|
||||||
- system-config-promote-image-gerrit-2.13
|
- system-config-promote-image-gerrit-2.13
|
||||||
- system-config-promote-image-gerrit-2.15:
|
- system-config-promote-image-gerrit-2.15:
|
||||||
dependencies:
|
dependencies:
|
||||||
|
@ -13,12 +13,23 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
|
FROM opendevorg/python-builder as builder
|
||||||
|
|
||||||
|
COPY . /tmp/src
|
||||||
|
RUN assemble
|
||||||
|
|
||||||
FROM openjdk:8
|
FROM openjdk:8
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y dumb-init \
|
&& apt-get install -y dumb-init python3-launchpadlib \
|
||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
|
&& curl https://bootstrap.pypa.io/get-pip.py > /tmp/get-pip.py \
|
||||||
|
&& python3 /tmp/get-pip.py \
|
||||||
|
&& rm /tmp/get-pip.py
|
||||||
|
|
||||||
|
COPY --from=builder /output/ /output
|
||||||
|
RUN /output/install-from-bindep
|
||||||
|
|
||||||
# 3000 is what the existing opendev gerrit2 uid is
|
# 3000 is what the existing opendev gerrit2 uid is
|
||||||
RUN addgroup gerrit --gid 3000 --system \
|
RUN addgroup gerrit --gid 3000 --system \
|
||||||
|
Loading…
Reference in New Issue
Block a user