From af80ee67f1fa074293bbcc2f92e3a449a5d32b63 Mon Sep 17 00:00:00 2001 From: Kim Rutherford Date: Tue, 28 Jan 2025 21:13:22 +1300 Subject: [PATCH] Run the (slow) Angular build later in Dockerfile Refs pombase/website#2038 --- etc/docker-conf/Dockerfile-main | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/etc/docker-conf/Dockerfile-main b/etc/docker-conf/Dockerfile-main index 4b4d3f7..536803f 100644 --- a/etc/docker-conf/Dockerfile-main +++ b/etc/docker-conf/Dockerfile-main @@ -103,16 +103,6 @@ RUN mkdir /pombase/.npm-global; npm config set prefix "/pombase/.npm-global" ENV PATH="/pombase/.npm-global/bin:$PATH" -RUN (cd pombase-website; ln -fs /pombase/main_config.json .; \ - cp etc/update_vars.sh /pombase/ && \ - npm install -g yarn; \ - yarn; \ - ./etc/build_app.sh $target && cp -r dist/browser/* /var/www/html/ && \ - cp dist/browser/assets/$database_name/* /var/www/html/assets/) && \ - rm -rf /pombase/pombase-website /pombe/.npm-global - -COPY genome_changelog/gene_characterisation_status/results/figure.svg /var/www/html/assets/gene_characterisation_status_figure.svg - RUN (cd /var/www/html/jbrowse; \ ./bin/prepare-refseqs.pl --fasta /pombase/chromosome_fasta/*_all_chromosomes.fa.gz \ --trackLabel 'refseqs' --key 'DNA sequence'; \ @@ -127,6 +117,16 @@ COPY --chown=pombase:pombase conf/docker-healthcheck docker-healthcheck RUN (cd /var/www/html/jbrowse; ./bin/generate-names.pl) +RUN (cd pombase-website; ln -fs /pombase/main_config.json .; \ + cp etc/update_vars.sh /pombase/ && \ + npm install -g yarn; \ + yarn; \ + ./etc/build_app.sh $target && cp -r dist/browser/* /var/www/html/ && \ + cp dist/browser/assets/$database_name/* /var/www/html/assets/) && \ + rm -rf /pombase/pombase-website /pombe/.npm-global + +COPY genome_changelog/gene_characterisation_status/results/figure.svg /var/www/html/assets/gene_characterisation_status_figure.svg + FROM scratch COPY --from=buildbase / /