Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace shiplift with bollard for Docker 25+ compatibility #595

Merged
merged 7 commits into from
Apr 9, 2024
Merged

Replace shiplift with bollard for Docker 25+ compatibility #595

merged 7 commits into from
Apr 9, 2024

Commits on Mar 29, 2024

  1. fix: Switch to bollard for docker API interaction 

    The `shiplift` library which is currently used to interact with the
docker API is unmaintained. Switch to `bollard` which is an actively
maintained and fairly popular library.

This fixes aws#537

Signed-off-by: Erdem Meydanli <[email protected]>
    @jalaziz @meerd
    jalaziz authored and meerd committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    666c3dd View commit details
    Browse the repository at this point in the history

  2. enclave_build: Add more tests 

    Add additional simple tests to docker.rs for better test coverage.

Signed-off-by: Erdem Meydanli <[email protected]>
    @meerd
    meerd committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    8624807 View commit details
    Browse the repository at this point in the history

  3. enclave_build: Extract inspect method 

    Extract inspect method in docker.rs to eliminate repetitive code.

Signed-off-by: Erdem Meydanli <[email protected]>
    @meerd
    meerd committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    bc88a39 View commit details
    Browse the repository at this point in the history

  4. enclave_build: Extract parse_docker_host method 

    Extract parse_docker_host method from get_credentials for reusability.

Signed-off-by: Erdem Meydanli <[email protected]>
    @meerd
    meerd committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    949e22e View commit details
    Browse the repository at this point in the history

  5. enclave_build: Extract build_tarball method 

    Extract build_tarball method from build_image in docker.rs for
reusability.

Signed-off-by: Erdem Meydanli <[email protected]>
    @meerd
    meerd committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    7b0bbdd View commit details
    Browse the repository at this point in the history

  6. enclave_build: Refactor docker.rs for consistent Runtime creation 

    Create Runtime instances at the beginning of method blocks in docker.rs
for consistency.

Signed-off-by: Erdem Meydanli <[email protected]>
    @meerd
    meerd committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    d750455 View commit details
    Browse the repository at this point in the history

  7. enclave_build: Extract stream output handling 

    Extract stream output handling code into handle_stream_output function
and move to utils.rs

Signed-off-by: Erdem Meydanli <[email protected]>
    @meerd
    meerd committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    66ff6fd View commit details
    Browse the repository at this point in the history