Adjust Dockerfile to take advantage of docker caching #1219
Conversation
…ding is much faster.
There was a problem hiding this comment.
This is great @jasonhildebrand, thanks a lot!
We had a similar version of this changes that we're using for some CI tests in a personal fork, but it never made it to vanilla, so we appreciate you bring this up.
I've added a couple of minor suggestions below and I'd appreciate if you can change the commit message, to reference the Redmine ticket I just created for this matter and to wrap the subject to 50 chars. Something like "Adjust Dockerfile, refs #13441", then an empty line and the body wrapped to 72 chars lines, if you want to explaining the changes a bit more.
Regards.
| && make -C /atom/src/plugins/arDominionPlugin \ | ||
| && make -C /atom/src/plugins/arArchivesCanadaPlugin \ | ||
| && composer install -d /atom/src | ||
|
|
||
|
|
| @@ -6,8 +6,6 @@ ENV FOP_HOME=/usr/share/fop-2.1 \ | |||
|
|
|||
| COPY --from=composer /usr/bin/composer /usr/bin/composer | |||
There was a problem hiding this comment.
I think it would be nice to move this layer too, just in case there are changes in the composer executable.
|
Thanks again @jasonhildebrand! I've moved it to #1247 with the suggestions I mentioned. |
|
OK, great. Thanks for going ahead and fixing this up - I had already moved on to a different project and wasn't able to get back ot this. |
I've upgraded archives.mhsc.ca to AtoM 2.6 - it's now hosted using docker. Kudos to you for your work on AtoM and your work to dockerize it!
I've worked with your Dockerfile a bit in updating our customizations and theming. One pain point I hit was that lessc (from make -C /atom/src/plugins/arDominionPlugin) failed due to a theming customization on our end. Fixing and re-running meant re-building the entire container. That meant several very slow iterations while I fixed that up.
I am submitting this PR which re-organizes your Dockerfile a bit. The local source tree almost always has changes from the previous build, so docker can't usually use any cached steps below
COPY . /atom/src. The main idea in the PR is to move the COPY lower down in the file to allow docker's cache to work. Building PHP doesn't depend on the codebase, so it's not necessary to have COPY above the PHP build.I also added the fcgi package - this allows a docker healthcheck to be defined in the atom container which tests that PHP-FPM is running and producing expected result (I can share the healthcheck code if you are interested).