Craftadoc/clsi
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mount /home/tex in an anonymous volume

Browse Source 
When we mount the container's root filesystem as read-only, mount
an anonymous volume in /home/tex so that it's writable. Our TeX Live
images have cached content in /home/tex. This content will automatically
get copied by Docker into this anonymous volume.
This commit is contained in:
Eric Mc Sween
2020-09-03 17:10:24 -04:00
parent f4fb979c63
commit c769ae63a2
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/js/DockerRunner.js
View File

@@ -277,6 +277,7 @@ const DockerRunner = {
if (Settings.clsi.docker.Readonly) { if (Settings.clsi.docker.Readonly) {
options.HostConfig.ReadonlyRootfs = true options.HostConfig.ReadonlyRootfs = true
options.HostConfig.Tmpfs = { '/tmp': 'rw,noexec,nosuid,size=65536k' } options.HostConfig.Tmpfs = { '/tmp': 'rw,noexec,nosuid,size=65536k' }
options.Volumes['/home/tex'] = {}
} }
// Allow per-compile group overriding of individual settings // Allow per-compile group overriding of individual settings
@@ -519,7 +520,7 @@ const DockerRunner = {
_destroyContainer(containerId, shouldForce, callback) { _destroyContainer(containerId, shouldForce, callback) {
logger.log({ containerId }, 'destroying docker container') logger.log({ containerId }, 'destroying docker container')
const container = dockerode.getContainer(containerId) const container = dockerode.getContainer(containerId)
container.remove({ force: shouldForce === true }, (error) => { container.remove({ force: shouldForce === true, v: true }, (error) => {
if (error != null && error.statusCode === 404) { if (error != null && error.statusCode === 404) {
logger.warn( logger.warn(
{ err: error, containerId }, { err: error, containerId },

4
test/unit/js/DockerRunnerTests.js
View File

@@ -802,7 +802,7 @@ describe('DockerRunner', function () {
(err) => { (err) => {
this.fakeContainer.remove.callCount.should.equal(1) this.fakeContainer.remove.callCount.should.equal(1)
this.fakeContainer.remove this.fakeContainer.remove
.calledWith({ force: true }) .calledWithMatch({ force: true })
.should.equal(true) .should.equal(true)
return done() return done()
} }
@@ -816,7 +816,7 @@ describe('DockerRunner', function () {
(err) => { (err) => {
this.fakeContainer.remove.callCount.should.equal(1) this.fakeContainer.remove.callCount.should.equal(1)
this.fakeContainer.remove this.fakeContainer.remove
.calledWith({ force: false }) .calledWithMatch({ force: false })
.should.equal(true) .should.equal(true)
return done() return done()
} }