Rely on internal volumes for the Docker-based test env
Do not use external volumes for the Docker-based test
environment, because it would rely on the user knowing
them upfront and preparing them with the expected permissions.
Using the internal volumes simplify the utilisation of
the Docker-based test environment, removing one element of
manual interaction from the picture.
Change-Id: Ia3009391b80f101353c88ffeeb4e8ec8121a69f1
diff --git a/src/test/docker/docker-compose.yaml b/src/test/docker/docker-compose.yaml
index 1365cd8..42c12c9 100644
--- a/src/test/docker/docker-compose.yaml
+++ b/src/test/docker/docker-compose.yaml
@@ -11,8 +11,8 @@
- gerrit-net
volumes:
- /dev/urandom:/dev/random
- - ./gitvolume:/var/gerrit/git
- - ./shareddir:/var/gerrit/shared/dir
+ - gitvolume:/var/gerrit/git
+ - shareddir:/var/gerrit/shareddir
- ./etc/gerrit.config:/var/gerrit/etc/gerrit.config.orig
- ./etc/high-availability.gerrit-01.config:/var/gerrit/etc/high-availability.config.orig
environment:
@@ -29,8 +29,8 @@
- gerrit-01
volumes:
- /dev/urandom:/dev/random
- - ./gitvolume:/var/gerrit/git
- - ./shareddir:/var/gerrit/shared/dir
+ - gitvolume:/var/gerrit/git
+ - shareddir:/var/gerrit/shareddir
- ./etc/gerrit.config:/var/gerrit/etc/gerrit.config.orig
- ./etc/high-availability.gerrit-02.config:/var/gerrit/etc/high-availability.config.orig
environment:
@@ -62,3 +62,5 @@
volumes:
syslog-sidecar:
+ shareddir:
+ gitvolume:
diff --git a/src/test/docker/etc/high-availability.gerrit-01.config b/src/test/docker/etc/high-availability.gerrit-01.config
index f269f52..a21f05c 100644
--- a/src/test/docker/etc/high-availability.gerrit-01.config
+++ b/src/test/docker/etc/high-availability.gerrit-01.config
@@ -1,5 +1,5 @@
[main]
- sharedDirectory = /var/gerrit/shared/dir
+ sharedDirectory = /var/gerrit/shareddir
[peerInfo]
strategy = static
diff --git a/src/test/docker/etc/high-availability.gerrit-02.config b/src/test/docker/etc/high-availability.gerrit-02.config
index b49f91b..d05c7ec 100644
--- a/src/test/docker/etc/high-availability.gerrit-02.config
+++ b/src/test/docker/etc/high-availability.gerrit-02.config
@@ -1,5 +1,5 @@
[main]
- sharedDirectory = /var/gerrit/shared/dir
+ sharedDirectory = /var/gerrit/shareddir
[peerInfo]
strategy = static
diff --git a/src/test/docker/gerrit/start.sh b/src/test/docker/gerrit/start.sh
index 0dae4c3..d906628 100755
--- a/src/test/docker/gerrit/start.sh
+++ b/src/test/docker/gerrit/start.sh
@@ -12,6 +12,7 @@
then
echo "Initializing Gerrit site ..."
sudo -u gerrit java -jar /var/gerrit/bin/gerrit.war init -d /var/gerrit --batch
+ chown -R gerrit: /var/gerrit/shareddir
fi
echo "Reindexing Gerrit ..."
