Get on latest docker-engine and GHC 9.8.2

codedownio · Sep 20, 2024 · e139ec0 · e139ec0
1 parent a307407
commit e139ec0
Show file tree

Hide file tree

Showing 11 changed files with 80 additions and 59 deletions.
diff --git a/.github/workflows/sandwich.yml b/.github/workflows/sandwich.yml
@@ -20,7 +20,7 @@ jobs:
         - "9.2.8"
         - "9.4.8"
         - "9.6.6"
-        - "9.8.1"
+        - "9.8.2"
 
     steps:
     - uses: actions/checkout@v4
@@ -41,10 +41,10 @@ jobs:
 
     # Because the HaskellNet dependency doesn't work yet with GHC 9.8
     - name: Disable demo-fake-smtp-server for GHC 9.8.x
-      if: ${{ matrix.ghc == '9.8.1' && runner.os == 'macOS' }}
+      if: ${{ matrix.ghc == '9.8.2' && runner.os == 'macOS' }}
       run: sed -i '.bak' 's/demos\/demo-fake-smtp-server/-- demos\/demo-fake-smtp-server/g' cabal.project
     - name: Disable demo-fake-smtp-server for GHC 9.8.x
-      if: ${{ matrix.ghc == '9.8.1' && runner.os != 'macOS' }}
+      if: ${{ matrix.ghc == '9.8.2' && runner.os != 'macOS' }}
       run: sed -i 's/demos\/demo-fake-smtp-server/-- demos\/demo-fake-smtp-server/g' cabal.project
 
     - uses: haskell-actions/setup@v2
@@ -124,8 +124,8 @@ jobs:
           yaml: "stack-9.4.8.yaml"
         - ghc: "9.6.5"
           yaml: "stack.yaml"
-        - ghc: "9.8.1"
-          yaml: "stack-9.8.1.yaml"
+        - ghc: "9.8.2"
+          yaml: "stack-9.8.2.yaml"
 
     steps:
     - uses: actions/checkout@v4

diff --git a/cabal.project b/cabal.project
@@ -49,8 +49,9 @@ packages:
 
 source-repository-package
   type: git
-  location: https://github.com/codedownio/docker-openapi.git
-  tag: f924f3262ef1dc5474f1b0ae3b60094376dca51e
+  location: https://github.com/codedownio/docker-engine.git
+  tag: ba5ebd823ed843a556cd8c24a5a0086a3f6e5a6c
+  subdir: v1.44
 
 source-repository-package
   type: git

diff --git a/sandwich-contexts-docker/lib/Test/Sandwich/Contexts/Docker.hs b/sandwich-contexts-docker/lib/Test/Sandwich/Contexts/Docker.hs
@@ -24,7 +24,7 @@ import DockerEngine.API.Network
 import DockerEngine.Client
 import DockerEngine.Core
 import DockerEngine.MimeTypes
-import DockerEngine.Model
+import DockerEngine.Model hiding (Map, Status(..))
 import Network.HTTP.Client as NH
 import Network.HTTP.Types.Status
 import qualified Network.Socket as S
@@ -63,17 +63,17 @@ doesNetworkExist ds networkName = isRight <$> inspectNetwork ds (Id networkName)
 
 createNetwork :: (HasCallStack, MonadUnliftIO m, MonadLoggerIO m) => DockerState -> Text -> Map Text Text -> Either () (Maybe (AddrRange IPv4)) -> m (Either Text ())
 createNetwork ds networkName labels ipv6OrSubnet = leftOnException $ do
-  let networkConfig = (mkNetworkConfig networkName) {
-        networkConfigAttachable = Just True
-        , networkConfigLabels = Just $ M.mapKeys toString labels
-        , networkConfigIpam = case ipv6OrSubnet of
+  let networkConfig = (mkNetworkCreateRequest networkName) {
+        networkCreateRequestAttachable = Just True
+        , networkCreateRequestLabels = Just $ M.mapKeys toString labels
+        , networkCreateRequestIpam = case ipv6OrSubnet of
             Right (Just subnet) -> Just $ mkIPAM {
               iPAMDriver = Just "default"
               -- ^ Need to set this default driver explicitly; see https://github.com/docker/compose/issues/5248
-              , iPAMConfig = Just [M.singleton "Subnet" (show subnet)]
+              , iPAMConfig = Just [mkIPAMConfig { iPAMConfigSubnet = Just (show subnet) }]
               }
             _ -> Nothing
-        , networkConfigEnableIPv6 = case ipv6OrSubnet of
+        , networkCreateRequestEnableIpv6 = case ipv6OrSubnet of
             Left _ -> Just True
             _ -> Nothing
         }

diff --git a/stack-9.2.8.yaml b/stack-9.2.8.yaml
@@ -34,8 +34,10 @@ extra-deps:
 
 ## For sandwich-contexts-docker
 
-- git: https://github.com/codedownio/docker-openapi.git
-  commit: dd83d02f45e059db515b0e90f53ddfccafdca494
+- git: https://github.com/codedownio/docker-engine.git
+  commit: ba5ebd823ed843a556cd8c24a5a0086a3f6e5a6c
+  subdirs:
+  - v1.44
 
 ## For sandwich-contexts-kubernetes
 

diff --git a/stack-9.2.8.yaml.lock b/stack-9.2.8.yaml.lock
@@ -58,16 +58,18 @@ packages:
     commit: 2fae6ae212a346acf400847d0b6cc647045822d1
     git: https://github.com/codedownio/minio-hs
 - completed:
-    commit: dd83d02f45e059db515b0e90f53ddfccafdca494
-    git: https://github.com/codedownio/docker-openapi.git
+    commit: ba5ebd823ed843a556cd8c24a5a0086a3f6e5a6c
+    git: https://github.com/codedownio/docker-engine.git
     name: docker-engine
     pantry-tree:
-      sha256: f4d791f4bb4fb61eb527cbb89427d5a24fef1e94c1beeed86f44aabf8220caf2
-      size: 3152
-    version: 1.36.0.0
+      sha256: 040cc87fbb2b6d61c03ffef104e9e2b8a4185c17b63ba0dd1590c518d4543d40
+      size: 2451
+    subdir: v1.44
+    version: 0.144.0
   original:
-    commit: dd83d02f45e059db515b0e90f53ddfccafdca494
-    git: https://github.com/codedownio/docker-openapi.git
+    commit: ba5ebd823ed843a556cd8c24a5a0086a3f6e5a6c
+    git: https://github.com/codedownio/docker-engine.git
+    subdir: v1.44
 - completed:
     commit: a747f6fdc62d34c684709740422497d3c088f8d9
     git: https://github.com/codedownio/kubernetes-client-haskell.git

diff --git a/stack-9.4.8.yaml b/stack-9.4.8.yaml
@@ -32,8 +32,10 @@ extra-deps:
 
 ## For sandwich-contexts-docker
 
-- git: https://github.com/codedownio/docker-openapi.git
-  commit: dd83d02f45e059db515b0e90f53ddfccafdca494
+- git: https://github.com/codedownio/docker-engine.git
+  commit: ba5ebd823ed843a556cd8c24a5a0086a3f6e5a6c
+  subdirs:
+  - v1.44
 
 ## For sandwich-contexts-kubernetes
 

diff --git a/stack-9.4.8.yaml.lock b/stack-9.4.8.yaml.lock
@@ -51,16 +51,18 @@ packages:
     commit: 2fae6ae212a346acf400847d0b6cc647045822d1
     git: https://github.com/codedownio/minio-hs
 - completed:
-    commit: dd83d02f45e059db515b0e90f53ddfccafdca494
-    git: https://github.com/codedownio/docker-openapi.git
+    commit: ba5ebd823ed843a556cd8c24a5a0086a3f6e5a6c
+    git: https://github.com/codedownio/docker-engine.git
     name: docker-engine
     pantry-tree:
-      sha256: f4d791f4bb4fb61eb527cbb89427d5a24fef1e94c1beeed86f44aabf8220caf2
-      size: 3152
-    version: 1.36.0.0
+      sha256: 040cc87fbb2b6d61c03ffef104e9e2b8a4185c17b63ba0dd1590c518d4543d40
+      size: 2451
+    subdir: v1.44
+    version: 0.144.0
   original:
-    commit: dd83d02f45e059db515b0e90f53ddfccafdca494
-    git: https://github.com/codedownio/docker-openapi.git
+    commit: ba5ebd823ed843a556cd8c24a5a0086a3f6e5a6c
+    git: https://github.com/codedownio/docker-engine.git
+    subdir: v1.44
 - completed:
     commit: a747f6fdc62d34c684709740422497d3c088f8d9
     git: https://github.com/codedownio/kubernetes-client-haskell.git

diff --git a/stack-9.8.1.yaml → stack-9.8.2.yaml b/stack-9.8.1.yaml → stack-9.8.2.yaml
@@ -1,5 +1,5 @@
 
-resolver: nightly-2024-07-08
+resolver: nightly-2024-09-19
 
 nix:
   pure: false
@@ -26,8 +26,10 @@ extra-deps:
 
 ## For sandwich-contexts-docker
 
-- git: https://github.com/codedownio/docker-openapi.git
-  commit: ada215498c2558ff6680f3b025ac3732b19bffb6
+- git: https://github.com/codedownio/docker-engine.git
+  commit: ba5ebd823ed843a556cd8c24a5a0086a3f6e5a6c
+  subdirs:
+  - v1.44
 
 ## For sandwich-contexts-kubernetes
 

diff --git a/stack-9.8.1.yaml.lock → stack-9.8.2.yaml.lock b/stack-9.8.1.yaml.lock → stack-9.8.2.yaml.lock
@@ -16,16 +16,18 @@ packages:
     commit: 1e63a0ec44fff374799b25a0a02c041eab664c4f
     git: https://github.com/codedownio/minio-hs
 - completed:
-    commit: ada215498c2558ff6680f3b025ac3732b19bffb6
-    git: https://github.com/codedownio/docker-openapi.git
+    commit: ba5ebd823ed843a556cd8c24a5a0086a3f6e5a6c
+    git: https://github.com/codedownio/docker-engine.git
     name: docker-engine
     pantry-tree:
-      sha256: 175c6ef9ad2b27058edf045710ddefbc1bfafa4b36626221a63c122bec06221b
-      size: 3152
-    version: 1.36.0.0
+      sha256: 040cc87fbb2b6d61c03ffef104e9e2b8a4185c17b63ba0dd1590c518d4543d40
+      size: 2451
+    subdir: v1.44
+    version: 0.144.0
   original:
-    commit: ada215498c2558ff6680f3b025ac3732b19bffb6
-    git: https://github.com/codedownio/docker-openapi.git
+    commit: ba5ebd823ed843a556cd8c24a5a0086a3f6e5a6c
+    git: https://github.com/codedownio/docker-engine.git
+    subdir: v1.44
 - completed:
     commit: a747f6fdc62d34c684709740422497d3c088f8d9
     git: https://github.com/codedownio/kubernetes-client-haskell.git
@@ -53,12 +55,16 @@ packages:
     git: https://github.com/codedownio/kubernetes-client-haskell.git
     subdir: kubernetes-client
 - completed:
-    hackage: oidc-client-0.8.0.0@sha256:b07cb83e836e037014f37da4641687905e9a9f04817692ef64f0e3a00456e5b4,3376
+    commit: b70757b85751525cba41316ea9af132d9a43cfaf
+    git: https://github.com/codedownio/haskell-oidc-client
+    name: oidc-client
     pantry-tree:
-      sha256: 7d9a3d4ae677ad01de54e296e39dcde3881e0aa161f3e25a68f42db997adce5a
-      size: 1298
+      sha256: b389011ec2b8e7422a56c82833075ddf0152f613044f7acdd1f51a1346d2f7ca
+      size: 1901
+    version: 0.8.0.0
   original:
-    hackage: oidc-client-0.8.0.0
+    commit: b70757b85751525cba41316ea9af132d9a43cfaf
+    git: https://github.com/codedownio/haskell-oidc-client
 - completed:
     commit: dcd0d5b200e96e90c6daa728585c23be5309a955
     git: https://github.com/codedownio/hs-certificate
@@ -74,7 +80,7 @@ packages:
     subdir: x509-validation
 snapshots:
 - completed:
-    sha256: bb93febdb9f085b5d3d5a841891ae5d13376dfd1034ff2ab026cb9d93cc67b05
-    size: 652323
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/7/8.yaml
-  original: nightly-2024-07-08
+    sha256: 027e1c40fdbeed68a4779a099ff8307c3054cd6ba61012305ea11b916bb41790
+    size: 663135
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/9/19.yaml
+  original: nightly-2024-09-19
diff --git a/stack.yaml b/stack.yaml
@@ -73,8 +73,10 @@ extra-deps:
 
 ## For sandwich-contexts-docker
 
-- git: https://github.com/codedownio/docker-openapi.git
-  commit: ada215498c2558ff6680f3b025ac3732b19bffb6
+- git: https://github.com/codedownio/docker-engine.git
+  commit: ba5ebd823ed843a556cd8c24a5a0086a3f6e5a6c
+  subdirs:
+  - v1.44
 
 ## For sandwich-contexts-kubernetes
 

diff --git a/stack.yaml.lock b/stack.yaml.lock
@@ -23,16 +23,18 @@ packages:
     commit: 2fae6ae212a346acf400847d0b6cc647045822d1
     git: https://github.com/codedownio/minio-hs
 - completed:
-    commit: ada215498c2558ff6680f3b025ac3732b19bffb6
-    git: https://github.com/codedownio/docker-openapi.git
+    commit: ba5ebd823ed843a556cd8c24a5a0086a3f6e5a6c
+    git: https://github.com/codedownio/docker-engine.git
     name: docker-engine
     pantry-tree:
-      sha256: 175c6ef9ad2b27058edf045710ddefbc1bfafa4b36626221a63c122bec06221b
-      size: 3152
-    version: 1.36.0.0
+      sha256: 040cc87fbb2b6d61c03ffef104e9e2b8a4185c17b63ba0dd1590c518d4543d40
+      size: 2451
+    subdir: v1.44
+    version: 0.144.0
   original:
-    commit: ada215498c2558ff6680f3b025ac3732b19bffb6
-    git: https://github.com/codedownio/docker-openapi.git
+    commit: ba5ebd823ed843a556cd8c24a5a0086a3f6e5a6c
+    git: https://github.com/codedownio/docker-engine.git
+    subdir: v1.44
 - completed:
     commit: a747f6fdc62d34c684709740422497d3c088f8d9
     git: https://github.com/codedownio/kubernetes-client-haskell.git