summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2015-05-27 11:55:07 -0400
committerJoey Hess2015-05-27 11:55:07 -0400
commit0361b016bad7448e908770555bb8c7207769f09f (patch)
treefd1c7945eed9c77e9d689003ff5a31e23d573b13 /config-joey.hs
parent5492c4f12c0daafe172d40ea22ea0ca635305d25 (diff)
parentc4fc8714fe21c83746886476279bcb2f8b47ccdd (diff)
Merge branch 'joeyconfig'
Conflicts: privdata.joey/privdata.gpg
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 2a173776..8c44d104 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -132,6 +132,7 @@ orca = standardSystem "orca.kitenet.net" Unstable "amd64"
& Systemd.persistentJournal
& Docker.configured
& Docker.docked (GitAnnexBuilder.standardAutoBuilderContainer dockerImage "amd64" 15 "2h")
+ & Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainerNspawn "amd64" 15 "2h")
& Docker.docked (GitAnnexBuilder.standardAutoBuilderContainer dockerImage "i386" 45 "2h")
& Docker.docked (GitAnnexBuilder.armelCompanionContainer dockerImage)
& Docker.docked (GitAnnexBuilder.armelAutoBuilderContainer dockerImage (Cron.Times "1 3 * * *") "5h")
@@ -458,7 +459,7 @@ standardSystemUnhardened hn suite arch motd = host hn
`onChange` Apt.autoRemove
standardStableContainer :: Docker.ContainerName -> Docker.Container
-standardStableContainer name = standardContainer name (Stable "wheezy") "amd64"
+standardStableContainer name = standardContainer name (Stable "jessie") "amd64"
-- This is my standard container setup, Featuring automatic upgrades.
standardContainer :: Docker.ContainerName -> DebianSuite -> Architecture -> Docker.Container