opendev/system-config
Code Issues Proposed changes

Merge "Use add instead of wget to download things for gerrit images"

Browse Source
This commit is contained in:
Zuul 2022-05-10 06:14:26 +00:00 committed by Gerrit Code Review
commit 813cc9b2ab
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/gerrit/base/Dockerfile
View File

@ -25,8 +25,7 @@ FROM docker.io/library/openjdk:11-bullseye as gerrit-base
RUN echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/95disable-recommends RUN echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/95disable-recommends
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y dumb-init python3-launchpadlib python3-distutils \ && apt-get install -y dumb-init python3-launchpadlib python3-distutils unzip \
wget unzip \
&& 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 \ && curl https://bootstrap.pypa.io/get-pip.py > /tmp/get-pip.py \
@ -60,8 +59,9 @@ RUN mkdir /var/gerrit/bin \
# Download mariadb java client. # Download mariadb java client.
# Modern gerrit stopped downloading missing libs during init which means we # Modern gerrit stopped downloading missing libs during init which means we
# need to do the downland and install ourselves. # need to do the downland and install ourselves.
RUN mkdir /var/gerrit/lib && \ # Note the perms on this are 0600 hence the need for the chown otherwise
wget https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/2.7.2/mariadb-java-client-2.7.2.jar -O /var/gerrit/lib/mariadb-java-client.jar # 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 # Allow incoming traffic
# OpenDev Gerrit listens on 8081 not default of 8080 # OpenDev Gerrit listens on 8081 not default of 8080