Move Gerrit init and reindexing steps to entrypoint.sh.
The Gerrit plugins need to be copied in the plugins folder before the init step is executed, otherwise plugin's init phase will be ignored.
Change-Id: I13dd9d2ef34d2480fce84ff2d870310234cf17d9
diff --git a/example-setup/broker/Dockerfile b/example-setup/broker/Dockerfile
index 2428338..abc12cf 100644
--- a/example-setup/broker/Dockerfile
+++ b/example-setup/broker/Dockerfile
@@ -4,11 +4,6 @@
RUN yum install -y gettext
-ARG JAVA_OPTS='--add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang.invoke=ALL-UNNAMED'
-
-RUN java $JAVA_OPTS -jar /var/gerrit/bin/gerrit.war init --batch --install-all-plugins -d /var/gerrit && \
- java $JAVA_OPTS -jar /var/gerrit/bin/gerrit.war reindex -d /var/gerrit
-
RUN git config -f /var/gerrit/etc/secure.config --add auth.bearerToken "theSecretBearerToken"
COPY --chown=gerrit:gerrit pull-replication.jar /var/gerrit/plugins/pull-replication.jar
diff --git a/example-setup/broker/entrypoint.sh b/example-setup/broker/entrypoint.sh
index 412c487..95a750d 100755
--- a/example-setup/broker/entrypoint.sh
+++ b/example-setup/broker/entrypoint.sh
@@ -16,5 +16,13 @@
setup_replication_config
setup_gerrit_config
+ARG JAVA_OPTS='--add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang.invoke=ALL-UNNAMED'
+
+echo "Init phase ..."
+java $JAVA_OPTS -jar /var/gerrit/bin/gerrit.war init --batch --install-all-plugins -d /var/gerrit
+
+echo "Reindexing phase ..."
+java $JAVA_OPTS -jar /var/gerrit/bin/gerrit.war reindex -d /var/gerrit
+
echo "Running Gerrit ..."
exec /var/gerrit/bin/gerrit.sh run
\ No newline at end of file
diff --git a/example-setup/http/Dockerfile b/example-setup/http/Dockerfile
index 6a2a1ad..34fd874 100644
--- a/example-setup/http/Dockerfile
+++ b/example-setup/http/Dockerfile
@@ -4,11 +4,6 @@
RUN yum install -y gettext
-ARG JAVA_OPTS='--add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang.invoke=ALL-UNNAMED'
-
-RUN java $JAVA_OPTS -jar /var/gerrit/bin/gerrit.war init --batch --install-all-plugins -d /var/gerrit && \
- java $JAVA_OPTS -jar /var/gerrit/bin/gerrit.war reindex -d /var/gerrit
-
RUN git config -f /var/gerrit/etc/secure.config --add auth.bearerToken "theSecretBearerToken"
COPY --chown=gerrit:gerrit pull-replication.jar /var/gerrit/plugins/pull-replication.jar
diff --git a/example-setup/http/entrypoint.sh b/example-setup/http/entrypoint.sh
index 412c487..95a750d 100755
--- a/example-setup/http/entrypoint.sh
+++ b/example-setup/http/entrypoint.sh
@@ -16,5 +16,13 @@
setup_replication_config
setup_gerrit_config
+ARG JAVA_OPTS='--add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang.invoke=ALL-UNNAMED'
+
+echo "Init phase ..."
+java $JAVA_OPTS -jar /var/gerrit/bin/gerrit.war init --batch --install-all-plugins -d /var/gerrit
+
+echo "Reindexing phase ..."
+java $JAVA_OPTS -jar /var/gerrit/bin/gerrit.war reindex -d /var/gerrit
+
echo "Running Gerrit ..."
exec /var/gerrit/bin/gerrit.sh run
\ No newline at end of file
