Fix docker gc-conductor setup Remove physical drives in docker containers to reduce disk space utilization Add re-indexing during Gerrit start Change-Id: I27a2b46dd93ee9c1778877bf9d03cfcc2cd2f13e
diff --git a/src/test/docker/docker-compose.yaml b/src/test/docker/docker-compose.yaml index 5686ed9..cd4022e 100644 --- a/src/test/docker/docker-compose.yaml +++ b/src/test/docker/docker-compose.yaml
@@ -13,8 +13,6 @@ environment: - POSTGRES_USER=postgres - POSTGRES_PASSWORD=postgres - volumes: - - db:/var/lib/postgresql/data gerrit-gc: build: gerrit @@ -27,9 +25,6 @@ gerrit-net: ipv4_address: 172.23.0.3 volumes: - - gitvolume:/var/gerrit/git - - etcvolume:/var/gerrit/etc - - logsvolume:/var/gerrit/logs - ./etc/gerrit.config:/var/gerrit/etc/gerrit.config.orig - ./etc/gc.config:/var/gerrit/etc/gc.config.orig - ./etc/log4j2.xml:/var/gerrit/etc/log4j2.xml.orig @@ -44,8 +39,3 @@ ipam: config: - subnet: 172.23.0.0/28 -volumes: - gitvolume: - etcvolume: - logsvolume: - db:
diff --git a/src/test/docker/gerrit/start_gerrit.sh b/src/test/docker/gerrit/start_gerrit.sh index 28ff843..ba2ed5e 100755 --- a/src/test/docker/gerrit/start_gerrit.sh +++ b/src/test/docker/gerrit/start_gerrit.sh
@@ -4,8 +4,14 @@ cp /var/gerrit/etc/gc.config.orig /var/gerrit/etc/gc.config cp /var/gerrit/etc/log4j2.xml.orig /var/gerrit/etc/log4j2.xml -echo "Initializing Gerrit site ..." -java -jar /var/gerrit/bin/gerrit.war init -d /var/gerrit --batch +if [[ ! -f /var/gerrit/etc/ssh_host_ed25519_key ]] +then + echo "Initializing Gerrit site ..." + java -jar /var/gerrit/bin/gerrit.war init -d /var/gerrit --batch +fi + +echo "Reindexing Gerrit ..." +java -jar /var/gerrit/bin/gerrit.war reindex -d /var/gerrit touch /var/gerrit/logs/{gc_log,error_log,httpd_log,sshd_log,replication_log} && tail -f /var/gerrit/logs/* | grep --line-buffered -v 'HEAD /' &