test: Remove custom gerrit start script We can move the necessary parts into the Dockerfile itself. Change-Id: I1eae55f5e270f25cecbc9b9c72db9d05a8489892
diff --git a/test/docker/gerrit/Dockerfile b/test/docker/gerrit/Dockerfile index dd42d7f..b826394 100755 --- a/test/docker/gerrit/Dockerfile +++ b/test/docker/gerrit/Dockerfile
@@ -1,13 +1,17 @@ FROM gerritcodereview/gerrit:3.5.0.1-ubuntu20 ENV GERRIT_SITE /var/gerrit -COPY artifacts/plugins/ $GERRIT_SITE/plugins/ +RUN rm -rf "$GERRIT_SITE/plugins" && mkdir "$GERRIT_SITE/plugins" +RUN git config -f "$GERRIT_SITE/etc/gerrit.config" auth.type \ + DEVELOPMENT_BECOME_ANY_ACCOUNT +RUN git config -f "$GERRIT_SITE/etc/gerrit.config" \ + sendemail.enable "false" +RUN git config -f "$GERRIT_SITE/etc/gerrit.config" \ + "operator-alias.change.independson" "in_depends-on" +RUN git config -f "$GERRIT_SITE/etc/gerrit.config" \ + "operator-alias.change.hasdependson" "has_depends-on" -USER root - -COPY artifacts/bin/ /tmp/ -COPY start.sh / -RUN { [ -e /tmp/gerrit.war ] && cp /tmp/gerrit.war "$GERRIT_SITE/bin/gerrit.war" ; } || true - -USER gerrit -ENTRYPOINT /start.sh +COPY artifacts /tmp/ +RUN cp /tmp/plugins/* "$GERRIT_SITE/plugins/" +RUN { [ -e /tmp/bin/gerrit.war ] && cp /tmp/bin/gerrit.war "$GERRIT_SITE/bin/gerrit.war" ; } || true +RUN chmod 777 "$GERRIT_SITE/git"
diff --git a/test/docker/gerrit/start.sh b/test/docker/gerrit/start.sh deleted file mode 100755 index cf48b39..0000000 --- a/test/docker/gerrit/start.sh +++ /dev/null
@@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -git config -f "$GERRIT_SITE/etc/gerrit.config" \ - operator-alias.change.independson "in_depends-on" -git config -f "$GERRIT_SITE/etc/gerrit.config" \ - operator-alias.change.hasdependson "has_depends-on" -git config -f "$GERRIT_SITE/etc/gerrit.config" \ - sendemail.enable "false" - -echo "Initializing Gerrit site ..." -java -jar "$GERRIT_SITE/bin/gerrit.war" init -d "$GERRIT_SITE" --batch - -echo "Running Gerrit ..." -exec "$GERRIT_SITE"/bin/gerrit.sh run