From 5a31c916235d3c38a8c7dca4d2bbfee7c8abb1b1 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 27 Aug 2019 13:19:18 +0200 Subject: [PATCH] Expose volume for tmp dir, add dirs for hooks and static Our existing config management puts files into hooks and static. We can bind mount those in, but having the mount-points in the image is useful. The tmp dir is important for gerrit to be able to write plugin expansions and javaamelody data. Change-Id: Idd917c268ed7bdead412620dfe3ca842736b7463 --- docker/gerrit/2.13/Dockerfile | 8 +++++--- docker/gerrit/base/Dockerfile | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/docker/gerrit/2.13/Dockerfile b/docker/gerrit/2.13/Dockerfile index 9d588976aa..00e5ae1294 100644 --- a/docker/gerrit/2.13/Dockerfile +++ b/docker/gerrit/2.13/Dockerfile @@ -34,8 +34,10 @@ RUN addgroup gerrit --gid 3000 --system \ USER gerrit # Download the gerrit war -RUN mkdir /var/gerrit/bin && \ - wget https://tarballs.openstack.org/gerrit/gerrit-v2.13.12.11.1707fec.war -O /var/gerrit/bin/gerrit.war +RUN mkdir /var/gerrit/bin \ + && mkdir /var/gerrit/hooks \ + && mkdir /var/gerrit/static \ + && wget https://tarballs.openstack.org/gerrit/gerrit-v2.13.12.11.1707fec.war -O /var/gerrit/bin/gerrit.war # Install plugins RUN mkdir /var/gerrit/plugins && \ @@ -53,7 +55,7 @@ RUN mkdir /var/gerrit/lib && \ # Allow incoming traffic EXPOSE 29418 8080 -VOLUME /var/gerrit/git /var/gerrit/index /var/gerrit/cache /var/gerrit/db /var/gerrit/etc /var/log/gerrit +VOLUME /var/gerrit/git /var/gerrit/index /var/gerrit/cache /var/gerrit/db /var/gerrit/etc /var/log/gerrit /var/gerrit/tmp RUN ln -s /var/log/gerrit /var/gerrit/logs diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile index acb4871da4..ee997bfd52 100644 --- a/docker/gerrit/base/Dockerfile +++ b/docker/gerrit/base/Dockerfile @@ -42,12 +42,14 @@ RUN addgroup gerrit --gid 3000 --system \ gerrit USER gerrit -RUN mkdir /var/gerrit/bin +RUN mkdir /var/gerrit/bin \ + && mkdir /var/gerrit/hooks \ + && mkdir /var/gerrit/static # Allow incoming traffic EXPOSE 29418 8080 -VOLUME /var/gerrit/git /var/gerrit/index /var/gerrit/cache /var/gerrit/db /var/gerrit/etc /var/log/gerrit +VOLUME /var/gerrit/git /var/gerrit/index /var/gerrit/cache /var/gerrit/db /var/gerrit/etc /var/log/gerrit /var/gerrit/tmp RUN ln -s /var/log/gerrit /var/gerrit/logs