Create Gerrit directories eagerly in Dockerfile-dev The lazy creation of Gerrit directories in the Dockerfile-dev had the side effect of keeping them owned by root, causing the container to fail at startup because of permissions issues. Change-Id: I6755b393859caad6ec4bef899710c43c76d3272a
diff --git a/almalinux/10/Dockerfile-dev b/almalinux/10/Dockerfile-dev index 964e564..e4044d2 100644 --- a/almalinux/10/Dockerfile-dev +++ b/almalinux/10/Dockerfile-dev
@@ -14,7 +14,7 @@ ADD entrypoint.sh / RUN adduser -m gerrit --home-dir /home/gerrit && \ - mkdir -p /var/gerrit/bin && \ + mkdir -p /var/gerrit/{bin,git,index,cache,db,etc} && \ chown -R gerrit /var/gerrit USER gerrit ARG GERRIT_WAR_URL="https://gerrit-ci.gerritforge.com/view/Gerrit/job/Gerrit-bazel-master/lastSuccessfulBuild/artifact/gerrit/bazel-bin/release.war"
diff --git a/ubuntu/26/Dockerfile-dev b/ubuntu/26/Dockerfile-dev index 8d96c6c..ee95bec 100644 --- a/ubuntu/26/Dockerfile-dev +++ b/ubuntu/26/Dockerfile-dev
@@ -10,9 +10,9 @@ ADD entrypoint.sh / -RUN adduser --disabled-password --gecos "" gerrit --home /home/gerrit && \ - mkdir -p /var/gerrit/bin && \ - chown -R gerrit /var/gerrit +RUN bash -c 'adduser --disabled-password --gecos "" gerrit --home /home/gerrit && \ + mkdir -p /var/gerrit/{bin,git,index,cache,db,etc} && \ + chown -R gerrit /var/gerrit' USER gerrit ARG GERRIT_WAR_URL="https://gerrit-ci.gerritforge.com/view/Gerrit/job/Gerrit-bazel-master/lastSuccessfulBuild/artifact/gerrit/bazel-bin/release.war" ADD --chown=gerrit $GERRIT_WAR_URL /var/gerrit/bin/gerrit.war