From 0da352bbfe3f431f7193bc734757c43d455e4c8f Mon Sep 17 00:00:00 2001 From: Giorgio Sironi Date: Mon, 29 Jan 2018 11:52:51 +0000 Subject: [PATCH] Containerized proofreader setup (#66) We now have a faster and more stable setup for proofreader, which copies it from another prebuilt image. --- Dockerfile.ci | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index c781fce5..ece5fa68 100644 --- a/Dockerfile.ci +++ b/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"]