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

[master] fix and refactor static packages (carry) #715

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

[master] fix and refactor static packages (carry) #715

wants to merge 12 commits into from
+751 −179

Commits on Jul 7, 2022

  1. script: target platform 

    Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @crazy-max @thaJeztah
    crazy-max authored and thaJeztah committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    28a80a7 View commit details
    Browse the repository at this point in the history

  2. static: fix and refactor 

    Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @crazy-max @thaJeztah
    crazy-max authored and thaJeztah committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    0d72e44 View commit details
    Browse the repository at this point in the history

  3. static: prevent empty env-vars from overriding build-arg defaults 

    Jenkins may set parameters to an empty value, in which case the build-args
may be overriding the default value with an empty value. This patch
explicitly unsets variables if they're empty (or not set).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    e46e949 View commit details
    Browse the repository at this point in the history

  4. static: create bundles 

    Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @crazy-max @thaJeztah
    crazy-max authored and thaJeztah committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    c7455a5 View commit details
    Browse the repository at this point in the history

  5. scripts: remove unsupported arches 

    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    6dc7fa8 View commit details
    Browse the repository at this point in the history

  6. makefile: utilities 

    Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @crazy-max @thaJeztah
    crazy-max authored and thaJeztah committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    820dc5c View commit details
    Browse the repository at this point in the history

  7. static: add compose and scan cli plugins 

    Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @crazy-max @thaJeztah
    crazy-max authored and thaJeztah committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    916472d View commit details
    Browse the repository at this point in the history

  8. static: shfmt 

    Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @crazy-max @thaJeztah
    crazy-max authored and thaJeztah committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    3d5e638 View commit details
    Browse the repository at this point in the history

  9. static: split cli, engine, and containerd packages 

    This splits the CLI, Engine, and containerd packages to allow downloading
the cli separate from the daemon, as well as (in future) allowing us to
do a containerd release without also requiring an engine release.

With this patch:

    make REF=v22.06.0-beta.0 VERSION=v22.06.0-beta.0 TARGETPLATFORM=linux/amd64 static

    static/build
    ├── bundles-ce-static-linux-x86_64.tar.gz
    └── linux
        └── amd64
            ├── containerd-1.6.4.tgz
            ├── docker-buildx-plugin-0.8.2.tgz
            ├── docker-cli-22.06.0-beta.0.tgz
            ├── docker-engine-22.06.0-beta.0.tgz
            ├── docker-compose-plugin-2.6.1.tgz
            ├── docker-rootless-extras-22.06.0-beta.0.tgz
            └── docker-scan-plugin-0.17.0.tgz

    2 directories, 8 files

    ls -lh static/build/linux/amd64/
    total 215208
    -rw-r--r--  1 sebastiaan  staff    31M Jun 29 00:21 containerd-1.6.4.tgz
    -rw-r--r--  1 sebastiaan  staff    14M Jun 29 00:21 docker-buildx-plugin-0.8.2.tgz
    -rw-r--r--  1 sebastiaan  staff   8.2M Jun 29 00:21 docker-cli-22.06.0-beta.0.tgz
    -rw-r--r--  1 sebastiaan  staff    19M Jun 29 00:21 docker-engine-22.06.0-beta.0.tgz
    -rw-r--r--  1 sebastiaan  staff   8.8M Jun 29 00:21 docker-compose-plugin-2.6.1.tgz
    -rw-r--r--  1 sebastiaan  staff    19M Jun 29 00:21 docker-rootless-extras-22.06.0-beta.0.tgz
    -rw-r--r--  1 sebastiaan  staff   4.4M Jun 29 00:21 docker-scan-plugin-0.17.0.tgz

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    2918a25 View commit details
    Browse the repository at this point in the history

  10. static: temporarily skip containerd package if it's not built 

    Moby's cross target currently doesn't include containerd binaries,
so skipping containerd to prevent publishing an empty tar.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    6c14212 View commit details
    Browse the repository at this point in the history

  11. gha: disable cross-compile for linux 

    GHA currently only has x86 machines, and the "cross" target in moby
does not include containerd and runc.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    00de62e View commit details
    Browse the repository at this point in the history

  12. Jenkinsfile: upload static artifacts 

    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    d382a27 View commit details
    Browse the repository at this point in the history