Ottomata has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357441 )
Change subject: Use the production topics configuration in the docker image. ...................................................................... Use the production topics configuration in the docker image. Change-Id: I52f51938160365da52cbe8a46258270e3af00cc5 --- M docker/service/Dockerfile D docker/service/topics.yaml 2 files changed, 9 insertions(+), 28 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/docker/service/Dockerfile b/docker/service/Dockerfile index 66119dd..5693d34 100644 --- a/docker/service/Dockerfile +++ b/docker/service/Dockerfile @@ -1,14 +1,14 @@ FROM wikimedia/eventlogging -COPY topics.yaml /etc/topics.yaml +RUN git clone https://gerrit.wikimedia.org/r/p/mediawiki/event-schemas /etc/event-schemas -ENTRYPOINT [ \ - "/usr/bin/python", \ - "-OO", \ - "/usr/src/eventlogging/bin/eventlogging-service", \ - "--topic-config", \ - "/etc/topics.yaml", \ - "--schemas-path", \ - "/usr/src/eventlogging/config/schemas/jsonschema" \ +ENTRYPOINT [ \ + "/usr/bin/python", \ + "-OO", \ + "/usr/src/eventlogging/bin/eventlogging-service", \ + "--topic-config", \ + "/etc/event-schemas/config/eventbus-topics.yaml", \ + "--schemas-path", \ + "/etc/event-schemas/jsonschema" \ ] CMD ["stdout://"] diff --git a/docker/service/topics.yaml b/docker/service/topics.yaml deleted file mode 100644 index 0fe7c6d..0000000 --- a/docker/service/topics.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# -# Topic config file. This file specifies which schemas are allowed to -# be produced to topics. -# - -mediawiki.page_edit: - schema_name: page_edit - -mediawiki.page_delete: - schema_name: page_delete - -mediawiki.page_move: - schema_name: page_move - -mediawiki.page_restore: - schema_name: page_restore - -mediawiki.revision_visibility_set: - schema_name: revision_visibility_set -- To view, visit https://gerrit.wikimedia.org/r/357441 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I52f51938160365da52cbe8a46258270e3af00cc5 Gerrit-PatchSet: 4 Gerrit-Project: eventlogging Gerrit-Branch: master Gerrit-Owner: Ppchelko <[email protected]> Gerrit-Reviewer: Mobrovac <[email protected]> Gerrit-Reviewer: Ottomata <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
