From bd4fb19388137d97c0f488dc02a3d5c2101e8e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sj=C3=B6lund?= Date: Mon, 3 Aug 2020 10:36:48 +0200 Subject: [PATCH] Build and use the new docker image with cleveref (#2626) Also added a README for updating the docker image --- .CI/Jenkinsfile | 2 +- .CI/latexml/Dockerfile.incremental | 5 +++++ .CI/latexml/README.md | 24 ++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 .CI/latexml/Dockerfile.incremental create mode 100644 .CI/latexml/README.md diff --git a/.CI/Jenkinsfile b/.CI/Jenkinsfile index 8656e5ac5..278f7c663 100644 --- a/.CI/Jenkinsfile +++ b/.CI/Jenkinsfile @@ -18,7 +18,7 @@ pipeline { stage('build') { agent { docker { - image 'modelicaspec/latexml:20200415' + image 'modelicaspec/latexml:20200803' label 'linux' alwaysPull true } diff --git a/.CI/latexml/Dockerfile.incremental b/.CI/latexml/Dockerfile.incremental new file mode 100644 index 000000000..7326879db --- /dev/null +++ b/.CI/latexml/Dockerfile.incremental @@ -0,0 +1,5 @@ +FROM modelicaspec/latexml:20200415 + +RUN tlmgr update --self \ + && tlmgr install cleveref \ + && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/ /root/.cpanm/work* diff --git a/.CI/latexml/README.md b/.CI/latexml/README.md new file mode 100644 index 000000000..92b4431bd --- /dev/null +++ b/.CI/latexml/README.md @@ -0,0 +1,24 @@ +# Updating the docker image + +The docker image is stored at the [docker hub](https://hub.docker.com/r/modelicaspec/latexml). +If you need write access to the organization, contact @sjoelund. + +To update the image, update the Dockerfile . +Then build and tag the image and upload it. + +```sh +docker build -t modelicaspec/latexml:`date +%Y%m%d` . +docker push modelicaspec/latexml:`date +%Y%m%d` +``` + +If the change is small you can base it on the old image instead of creating a new one from scratch. +Modify Dockerfile.incremental to be based on the image you want to update. +Make sure that the regular Dockerfile is also updated (so future builds incorporates these additions). + +```sh +docker build -t modelicaspec/latexml:`date +%Y%m%d` - < Dockerfile.incremental +docker push modelicaspec/latexml:`date +%Y%m%d` +``` + +Once the docker image is updated, modify `../Jenkinsfile` to use this image. +Put all of this in the same commit and see if the CI build accepts it.