diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-02-04 17:07:32 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-02-04 17:07:32 -0400 |
| commit | 8f37ddf53da31987f3db01d51fd9119d1e0c8a1d (patch) | |
| tree | 786d557ab7d083137e1bf0a18a5eae1c5fd9d18d /src/Propellor/Property/Docker.hs | |
| parent | 5ff45a37b1ffde8fe9150815d81236354c89e20b (diff) | |
| parent | 25f6871e1dda3de252fbc6c8ac6962eb0cd9311a (diff) | |
Merge remote-tracking branch 'wzhd/archlinux'
Diffstat (limited to 'src/Propellor/Property/Docker.hs')
| -rw-r--r-- | src/Propellor/Property/Docker.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs index 2ef97438..0bfcc781 100644 --- a/src/Propellor/Property/Docker.hs +++ b/src/Propellor/Property/Docker.hs @@ -55,6 +55,7 @@ import Propellor.Container import qualified Propellor.Property.File as File import qualified Propellor.Property.Apt as Apt import qualified Propellor.Property.Cmd as Cmd +import qualified Propellor.Property.Pacman as Pacman import qualified Propellor.Shim as Shim import Utility.Path import Utility.ThreadScheduler @@ -68,8 +69,8 @@ import Data.List.Utils import qualified Data.Map as M import System.Console.Concurrent -installed :: Property DebianLike -installed = Apt.installed ["docker.io"] +installed :: Property (DebianLike + ArchLinux) +installed = Apt.installed ["docker.io"] `pickOS` Pacman.installed ["docker"] -- | Configures docker with an authentication file, so that images can be -- pushed to index.docker.io. Optional. |