| commit | f72c3866395f05dadbf0250a67a928d09fd9783c | [log] [tgz] |
|---|---|---|
| author | Fabio Ponciroli <ponch78@gmail.com> | Tue Mar 31 18:52:33 2020 +0200 |
| committer | Fabio Ponciroli <ponch78@gmail.com> | Tue Mar 31 18:52:33 2020 +0200 |
| tree | 2f0aa47fb4ddff16ed31e200fb781a8c8e48dbde | |
| parent | c9cff7d1267e02257442dbcc87ae216220e54564 [diff] |
Extract Gerrit related files from recipe The build of the Gerrit image is common to all recipes. Change-Id: I3851459f4d6aa351e3886691744a6eb9c15626c6
diff --git a/.gitignore b/.gitignore index 97f349b..28ed166 100644 --- a/.gitignore +++ b/.gitignore
@@ -1,6 +1,6 @@ setup.env gerrit.setup -*/gerrit/plugins/*.jar -*/gerrit/etc/*key* +gerrit/plugins/*.jar +gerrit/etc/*key* gerrit.config secure.config
diff --git a/single-master/gerrit/Dockerfile b/gerrit/Dockerfile similarity index 100% rename from single-master/gerrit/Dockerfile rename to gerrit/Dockerfile
diff --git a/single-master/gerrit/Makefile b/gerrit/Makefile similarity index 92% rename from single-master/gerrit/Makefile rename to gerrit/Makefile index 7f95951..71f9389 100644 --- a/single-master/gerrit/Makefile +++ b/gerrit/Makefile
@@ -1,4 +1,4 @@ -include ../setup.env +include ../$(RECIPE)/setup.env docker-registry-login: aws ecr get-login-password --region $(AWS_REGION) \
diff --git a/single-master/gerrit/entrypoint.sh b/gerrit/entrypoint.sh similarity index 100% rename from single-master/gerrit/entrypoint.sh rename to gerrit/entrypoint.sh
diff --git a/single-master/gerrit/etc/gerrit.config.template b/gerrit/etc/gerrit.config.template similarity index 100% rename from single-master/gerrit/etc/gerrit.config.template rename to gerrit/etc/gerrit.config.template
diff --git a/single-master/gerrit/etc/secure.config.template b/gerrit/etc/secure.config.template similarity index 100% rename from single-master/gerrit/etc/secure.config.template rename to gerrit/etc/secure.config.template
diff --git a/single-master/gerrit/gerrit.setup.template b/gerrit/gerrit.setup.template similarity index 100% rename from single-master/gerrit/gerrit.setup.template rename to gerrit/gerrit.setup.template
diff --git a/single-master/gerrit/plugins/.empty b/gerrit/plugins/.empty similarity index 100% rename from single-master/gerrit/plugins/.empty rename to gerrit/plugins/.empty
diff --git a/single-master/gerrit/requirements.txt b/gerrit/requirements.txt similarity index 100% rename from single-master/gerrit/requirements.txt rename to gerrit/requirements.txt
diff --git a/single-master/gerrit/setup_gerrit.py b/gerrit/setup_gerrit.py similarity index 100% rename from single-master/gerrit/setup_gerrit.py rename to gerrit/setup_gerrit.py
diff --git a/single-master/Makefile b/single-master/Makefile index 65729b7..53237da 100644 --- a/single-master/Makefile +++ b/single-master/Makefile
@@ -106,4 +106,4 @@ delete-cluster wait-for-cluster-deletion \ gerrit-publish: - $(MAKE) -C gerrit gerrit-publish + $(MAKE) -C ../gerrit gerrit-publish RECIPE=single-master