Merge branch 'develop' of github.com:elifesciences/annotations into s…

…anitize-annotations

Dockerfile.ci

@@ -1,4 +1,5 @@
 ARG commit=develop
+FROM elifesciences/proofreader-php:latest AS proofreader
 FROM elifesciences/annotations_cli:${commit}
 USER root
 
@@ -7,9 +8,11 @@ RUN git clone https://github.com/asm89/smoke.sh /opt/smoke.sh
 
 RUN mkdir -p build && chown www-data:www-data build
 
+USER elife
+COPY --from=proofreader --chown=elife:elife /srv/proofreader-php /srv/proofreader-php
+RUN ln -s /srv/proofreader-php/bin/proofreader /srv/bin/proofreader
+
 USER www-data
-RUN composer global --no-interaction require elife/proofreader-php=dev-master
-ENV PATH="/var/www/.composer/vendor/bin:${PATH}"
 COPY .php_cs project_tests.sh smoke_tests.sh /srv/annotations/
 
 CMD ["/bin/bash", "project_tests.sh"]