chore: Update dependencies

.circleci/config.yml

@@ -3,11 +3,11 @@ version: 2
 jobs:
   test_ssl:
     docker:
-      - image: docker:25.0.3
+      - image: docker:25.0.5
     steps:
       - checkout
       - setup_remote_docker
-      - run: docker create -v /certs --name certs alpine:3.4 /bin/true
+      - run: docker create -v /certs --name certs alpine:3 /bin/true
       - run: docker run --rm -e SSL_SUBJECT=test.example.com -e SSL_DNS=test.example.com --volumes-from certs paulczar/omgwtfssl
       - run: docker run -h test.example.com --volumes-from certs -d --privileged --name test-docker-daemon docker:stable-dind --storage-driver=overlay --tlsverify --tlscacert=/certs/ca.pem --tlscert=/certs/cert.pem --tlskey=/certs/key.pem
       - run: docker run --rm --volumes-from certs --privileged --rm --entrypoint=chmod docker:stable-dind 644 /certs/key.pem /certs/ca-key.pem
@@ -17,7 +17,7 @@ jobs:
       - run: docker run -ti -e DOCKER_CERT_PATH=/certs -e DOCKER_HOST='https://test.example.com:2376' --volumes-from certs --rm --link test-docker-daemon:docker bollard cargo test --features webpki -- --test test_connect_with_defaults
   test_http:
     docker:
-      - image: docker:25.0.3
+      - image: docker:25.0.5
     steps:
       - checkout
       - setup_remote_docker
@@ -27,7 +27,7 @@ jobs:
       - run: docker run -ti -e DOCKER_HOST='tcp://test.example.com:2375' --rm --link test-docker-daemon:docker bollard cargo test -- --test test_connect_with_defaults
   test_unix:
     docker:
-      - image: docker:25.0.3
+      - image: docker:25.0.5
     steps:
       - checkout
       - setup_remote_docker
@@ -36,31 +36,31 @@ jobs:
       - run: docker run -ti -e DOCKER_HOST='unix:///var/run/docker.sock' -v /var/run/docker.sock:/var/run/docker.sock --rm bollard cargo test -- --test test_connect_with_defaults
   test_buildkit:
     docker:
-      - image: docker:25.0.3
+      - image: docker:25.0.5
     steps:
       - checkout
       - setup_remote_docker
       - run: docker build -t bollard .
       - run: resources/dockerfiles/bin/run_integration_tests.sh --features buildkit --tests
   test_chrono:
     docker:
-      - image: docker:25.0.3
+      - image: docker:25.0.5
     steps:
       - checkout
       - setup_remote_docker
       - run: docker build -t bollard .
       - run: resources/dockerfiles/bin/run_integration_tests.sh --features chrono --tests
   test_time:
     docker:
-      - image: docker:25.0.3
+      - image: docker:25.0.5
     steps:
       - checkout
       - setup_remote_docker
       - run: docker build -t bollard .
       - run: resources/dockerfiles/bin/run_integration_tests.sh --features time --tests
   test_race:
     docker:
-      - image: docker:25.0.3
+      - image: docker:25.0.5
     steps:
       - checkout
       - setup_remote_docker
@@ -70,23 +70,23 @@ jobs:
       - run: docker run -ti -e DOCKER_HOST='unix:///var/run/docker.sock' -v /var/run/docker.sock:/var/run/docker.sock --rm bollard cargo test test_runtime
   test_doc:
     docker:
-      - image: docker:25.0.3
+      - image: docker:25.0.5
     steps:
       - checkout
       - setup_remote_docker
       - run: docker build -t bollard .
       - run: docker run -ti --rm bollard cargo test --all-features --target x86_64-unknown-linux-gnu --doc
   test_clippy:
     docker:
-      - image: docker:25.0.3
+      - image: docker:25.0.5
     steps:
       - checkout
       - setup_remote_docker
       - run: docker build -t bollard .
       - run: docker run -ti --rm bollard bash -c "rustup component add clippy && cargo clippy --all-targets -- -Dwarnings"
   test_audit:
     docker:
-      - image: docker:25.0.3
+      - image: docker:25.0.5
     steps:
       - checkout
       - setup_remote_docker
@@ -95,7 +95,7 @@ jobs:
       - run: docker run -ti --rm bollard bash -c "cargo install --locked cargo-audit && cargo audit --deny warnings --ignore=RUSTSEC-2020-0071"
   test_fmt:
     docker:
-      - image: docker:25.0.3
+      - image: docker:25.0.5
     steps:
       - checkout
       - setup_remote_docker

.github/dependabot.yml

@@ -4,11 +4,23 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "cargo"
+    directory: "/codegen/proto"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "cargo"
+    directory: "/codegen/swagger"
+    schedule:
+      interval: "daily"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "daily"
-  - package-ecosystem: "maven"
-    directory: "/codegen"
+  - package-ecosystem: "docker"
+    directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "maven"
+    directory: "/codegen/swagger"
+    schedule:
+      interval: "weekly"

Cargo.toml

@@ -44,41 +44,41 @@ bytes = "1"
 chrono = { version = "0.4", default-features = false, features = ["std", "clock", "serde"], optional = true }
 futures-core = "0.3"
 futures-util = "0.3"
-hex = "0.4.2"
+hex = "0.4"
 home = { version = "0.5", optional = true }
-http = "1.0"
-http-body-util = "0.1.0"
-hyper = { version = "1.2", features = ["client", "http1"] }
+http = "1.1"
+http-body-util = "0.1"
+hyper = { version = "1.3", features = ["client", "http1"] }
 hyper-rustls = { version = "0.27", optional = true }
-hyper-util = { version = "0.1.3", features = ["http1", "client-legacy", "tokio"] }
+hyper-util = { version = "0.1.5", features = ["http1", "client-legacy", "tokio"] }
 log = "0.4"
-pin-project-lite = "0.2.8"
+pin-project-lite = "0.2"
 num = { version = "0.4", optional = true }
 rand = { version = "0.8", optional = true }
 rustls = { version = "0.23", optional = true, features = ["ring"] }
 rustls-native-certs = { version = "0.7.0", optional = true }
-rustls-pemfile = { version = "2.0", optional = true }
-rustls-pki-types = { version = "1.1", optional = true }
+rustls-pemfile = { version = "2.1", optional = true }
+rustls-pki-types = { version = "1.7", optional = true }
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-serde_repr = "0.1.6"
+serde_repr = "0.1"
 serde_urlencoded = "0.7"
-tokio = { version = "1.35", features = ["time", "net", "io-util"] }
+tokio = { version = "1.38", features = ["time", "net", "io-util"] }
 tonic = { version = "0.11", optional = true }
 thiserror = "1.0"
 time = { version = "0.3", features = ["formatting", "parsing"], optional = true }
 tokio-util = { version = "0.7", features = ["codec"] }
 tower-service = { version = "0.3", optional = true }
-url = "2.2"
+url = "2.5"
 webpki-roots = { version = "0.26", optional = true }
 
 [dev-dependencies]
 flate2 = "1.0"
 tar = "0.4"
-tokio = { version = "1.7", features = ["fs", "rt-multi-thread", "macros"] }
+tokio = { version = "1.38", features = ["fs", "rt-multi-thread", "macros"] }
 yup-hyper-mock = { version = "8.0.0" }
-once_cell = "1.19.0"
+once_cell = "1.19"
 
 [target.'cfg(unix)'.dependencies]
 hyperlocal-next = { version = "0.9.0" }

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.75.0-buster
+FROM rust:1.79.0-slim
 
 WORKDIR /usr/src/bollard
 

codegen/proto/Cargo.toml

@@ -25,5 +25,5 @@ tonic = { version = "0.11" }
 prost = { version = "0.12" }
 prost-types = "0.12"
 tonic-build = { version = "0.11", optional = true }
-ureq = { version = "2.9.6", optional = true}
+ureq = { version = "2.9.7", optional = true}
 

codegen/swagger/Cargo.toml

@@ -18,5 +18,5 @@ serde = { version = "1.0", features = ["derive"] }
 prost = { version = "0.12", optional = true }
 time = { version = "0.3", features = ["formatting", "parsing"], optional = true }
 
-serde_with = {version = "3.0", default-features = false, features = ["std"]}
+serde_with = {version = "3.8", default-features = false, features = ["std"]}
 serde_repr = "0.1"

codegen/swagger/pom.xml

@@ -7,12 +7,16 @@
 
     <!-- build with: mvn clean compiler:compile generate-resources -->
 
+    <properties>
+        <swagger-codegen.version>2.4.41</swagger-codegen.version>
+    </properties>
+
     <build>
       <plugins>
         <plugin>
           <groupId>io.swagger</groupId>
           <artifactId>swagger-codegen-maven-plugin</artifactId>
-          <version>2.4.29</version>
+          <version>${swagger-codegen.version}</version>
           <executions>
             <execution>
               <goals>
@@ -52,7 +56,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-codegen</artifactId>
-            <version>2.4.29</version>
+            <version>${swagger-codegen.version}</version>
         </dependency>
     </dependencies>
 </project>

resources/dockerfiles/bin/run_integration_tests.sh

@@ -5,9 +5,9 @@
 # the registry. Finally, runs the tests.
 
 export REGISTRY_PASSWORD=$(date | md5sum | cut -f1 -d\ )
-docker create -v /etc/docker/registry --name config alpine:3.4 /bin/true
+docker create -v /etc/docker/registry --name config alpine:3 /bin/true
 echo -n "${REGISTRY_PASSWORD}" | docker run --rm -i --entrypoint=htpasswd --volumes-from config nimmis/alpine-apache -i -B -c /etc/docker/registry/htpasswd bollard
-cat resources/dockerfiles/registry/config.yml | docker run --rm -i --volumes-from config --entrypoint=tee alpine:3.4 /etc/docker/registry/config.yml
+cat resources/dockerfiles/registry/config.yml | docker run --rm -i --volumes-from config --entrypoint=tee alpine:3 /etc/docker/registry/config.yml
 docker run -d --restart always --name registry -p 5000:5000 --volumes-from config registry:2
 sleep 4
 docker login --username bollard --password "${REGISTRY_PASSWORD}" localhost:5000

src/grpc/driver/mod.rs

@@ -160,15 +160,15 @@ pub(crate) async fn solve(
     let secret = SecretsServer::new(secret_provider);
 
     let mut services: Vec<GrpcServer> = vec![
-        super::GrpcServer::Auth(auth),
-        super::GrpcServer::Upload(upload),
-        super::GrpcServer::Secrets(secret),
+        GrpcServer::Auth(auth),
+        GrpcServer::Upload(upload),
+        GrpcServer::Secrets(secret),
     ];
 
     if let Some(path) = path {
         let filesend = FileSendServer::new(super::FileSendImpl::new(path.as_path()));
 
-        services.push(super::GrpcServer::FileSend(filesend));
+        services.push(GrpcServer::FileSend(filesend));
     }
 
     let tear_down_handler = driver.get_tear_down_handler();

src/grpc/error.rs

@@ -83,7 +83,7 @@ pub enum GrpcAuthError {
     HyperError {
         /// The source hyper error
         #[from]
-        err: hyper::http::Error,
+        err: http::Error,
     },
     /// Error while deserializing the payload emitted by the registry
     #[error("Serde payload deserializing error during GRPC authentication")]
@@ -97,7 +97,7 @@ pub enum GrpcAuthError {
     InvalidUriError {
         /// The invalid uri error
         #[from]
-        err: hyper::http::uri::InvalidUri,
+        err: http::uri::InvalidUri,
     },
     /// Error that is emitted by the hyper-util legacy bridge client
     #[error("Error in the hyper legacy client: {}", err)]

src/image.rs

@@ -1184,7 +1184,7 @@ impl Docker {
 
                 let stream = self.process_into_stream::<BuildInfo>(req).map(Either::Left);
 
-                futures_util::stream::select(stream, session)
+                stream::select(stream, session)
                     .filter_map(|either| async move {
                         match either {
                             Either::Left(data) => Some(data),

src/lib.rs

@@ -276,7 +276,6 @@
     trivial_numeric_casts,
     //unstable_features,
     unused_import_braces,
-    unused_qualifications
 )]
 #![allow(
     clippy::upper_case_acronyms,

tests/container_test.rs

@@ -526,7 +526,7 @@ async fn prune_containers_test(docker: Docker) -> Result<(), Error> {
                 "stefanscherer/registry-windows",
                 "moby/buildkit:master",
                 // Containers existing on CircleCI after a prune
-                "docker:25.0.3",
+                "docker:25.0.5",
                 "public.ecr.aws/eks-distro/kubernetes/pause:3.6"
             ]
             .into_iter()

tests/image_test.rs

@@ -920,7 +920,7 @@ async fn export_images_test(docker: Docker) -> Result<(), Error> {
 }
 
 async fn issue_55_test(docker: Docker) -> Result<(), Error> {
-    let dockerfile = "FROM ubuntu:18.04
+    let dockerfile = "FROM ubuntu:24.04
 RUN apt-get update && \
     apt-get install -y \
         build-essential \
@@ -932,13 +932,13 @@ RUN apt-get update && \
         musl-dev \
         musl-tools \
         libpq-dev \
-        libsqlite-dev \
+        libsqlite3-dev \
         libssl-dev \
         linux-libc-dev \
         pkgconf \
         sudo \
         xutils-dev \
-        gcc-multilib-arm-linux-gnueabihf \
+        gcc-13-arm-linux-gnueabihf \
         && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 ";