Skip to content

Commit

Permalink
update buildx version
Browse files Browse the repository at this point in the history
  • Loading branch information
@spowelljr
spowelljr committed Jul 19, 2024
1 parent 071caf4 commit 6c571d1
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 18 deletions.
19 changes: 13 additions & 6 deletions .github/workflows/update-iso-image-versions.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@ jobs:
OLD_BUILDKIT=$(DEP=buildkit make get-dependency-version)
OLD_CNI_PLUGINS=$(DEP=cni-plugins make get-dependency-version)
OLD_CONTAINERD=$(DEP=containerd make get-dependency-version)
OLD_CRIO=$(DEP=cri-o make get-dependency-version)
OLD_CRICTL=$(DEP=crictl make get-dependency-version)
OLD_CRIO=$(DEP=cri-o make get-dependency-version)
OLD_CRUN=$(DEP=crun make get-dependency-version)
OLD_DOCKER=$(DEP=docker make get-dependency-version)
OLD_DOCKER_BUILDX=$(DEP=docker-buildx make get-dependency-version)
OLD_GO=$(DEP=go make get-dependency-version)
OLD_NERDCTL=$(DEP=nerdctl make get-dependency-version)
OLD_NERDCTLD=$(DEP=nerdctld make get-dependency-version)
Expand All @@ -37,6 +38,7 @@ jobs:
# make update-crictl-version
make update-crun-version
make update-docker-version
make update-docker-buildx-version
make update-golang-version
make update-nerdctl-version
make update-nerdctld-version
Expand All @@ -45,10 +47,11 @@ jobs:
NEW_BUILDKIT=$(DEP=buildkit make get-dependency-version)
NEW_CNI_PLUGINS=$(DEP=cni-plugins make get-dependency-version)
NEW_CONTAINERD=$(DEP=containerd make get-dependency-version)
NEW_CRIO=$(DEP=cri-o make get-dependency-version)
NEW_CRICTL=$(DEP=crictl make get-dependency-version)
NEW_CRIO=$(DEP=cri-o make get-dependency-version)
NEW_CRUN=$(DEP=crun make get-dependency-version)
NEW_DOCKER=$(DEP=docker make get-dependency-version)
NEW_DOCKER_BUILDX=$(DEP=docker-buildx make get-dependency-version)
NEW_GO=$(DEP=go make get-dependency-version)
NEW_NERDCTL=$(DEP=nerdctl make get-dependency-version)
NEW_NERDCTLD=$(DEP=nerdctld make get-dependency-version)
Expand All @@ -67,14 +70,14 @@ jobs:
echo "### Update containerd from $OLD_CONTAINERD to $NEW_CONTAINERD" >> "$GITHUB_OUTPUT"
echo "[Release notes](https://github.com/containerd/containerd/releases)" >> "$GITHUB_OUTPUT"
fi
if [ "$OLD_CRIO" != "$NEW_CRIO" ]; then
echo "### Update CRI-O from $OLD_CRIO to $NEW_CRIO" >> "$GITHUB_OUTPUT"
echo "[Release notes](https://github.com/cri-o/cri-o/releases)" >> "$GITHUB_OUTPUT"
fi
if [ "$OLD_CRICTL" != "$NEW_CRICTL" ]; then
echo "### Update crictl from $OLD_CRICTL to $NEW_CRICTL" >> "$GITHUB_OUTPUT"
echo "[Release notes](https://github.com/kubernetes-sigs/cri-tools/releases)" >> "$GITHUB_OUTPUT"
fi
if [ "$OLD_CRIO" != "$NEW_CRIO" ]; then
echo "### Update CRI-O from $OLD_CRIO to $NEW_CRIO" >> "$GITHUB_OUTPUT"
echo "[Release notes](https://github.com/cri-o/cri-o/releases)" >> "$GITHUB_OUTPUT"
fi
if [ "$OLD_CRUN" != "$NEW_CRUN" ]; then
echo "### Update crun from $OLD_CRUN to $NEW_CRUN" >> "$GITHUB_OUTPUT"
echo "[Release notes](https://github.com/containers/crun/releases)" >> "$GITHUB_OUTPUT"
Expand All @@ -83,6 +86,10 @@ jobs:
echo "### Update Docker from $OLD_DOCKER to $NEW_DOCKER" >> "$GITHUB_OUTPUT"
echo "[Release notes](https://github.com/moby/moby/releases)" >> "$GITHUB_OUTPUT"
fi
if [ "$OLD_DOCKER_BUILDX" != "$NEW_DOCKER_BUILDX" ]; then
echo "### Update buildx from $OLD_DOCKER_BUILDX to $NEW_DOCKER_BUILDX" >> "$GITHUB_OUTPUT"
echo "[Release notes](https://github.com/docker/buildx/releases)" >> "$GITHUB_OUTPUT"
fi
if [ "$OLD_GO" != "$NEW_GO" ]; then
echo "### Update Go from $OLD_GO to $NEW_GO" >> "$GITHUB_OUTPUT"
fi
Expand Down
6 changes: 3 additions & 3 deletions deploy/iso/minikube-iso/arch/aarch64/package/Config.in
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
menu "System tools aarch64"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/buildkit-bin-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-plugins-latest-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/containerd-bin-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cri-dockerd-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crictl-bin-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-bin-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-plugins-latest-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/containerd-bin-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/nerdctl-bin-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-buildx-aarch64/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/nerdctl-bin-aarch64/Config.in"
endmenu
2 changes: 1 addition & 1 deletion deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.hash
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sha256 565e36085a35bba5104f37365ba796c111338eea1a0902b3a7ff42e2e1248815 buildx-v0.11.2.linux-arm64
sha256 3ba35a5d38361a64b62aeb9d20acc835ff6862a711cb438e610026b29c0ac489 buildx-v0.13.1.linux-arm64
4 changes: 2 additions & 2 deletions deploy/iso/minikube-iso/arch/aarch64/package/docker-buildx-aarch64/docker-buildx.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

DOCKER_BUILDX_AARCH64_VERSION = v0.11.2
DOCKER_BUILDX_AARCH64_COMMIT = 9872040b6626fb7d87ef7296fd5b832e8cc2ad17
DOCKER_BUILDX_AARCH64_VERSION = v0.13.1
DOCKER_BUILDX_AARCH64_COMMIT = 788433953af10f2a698f5c07611dddce2e08c7a0

define DOCKER_BUILDX_AARCH64_CONFIGURE_CMDS
mkdir -p $(TARGET_DIR)/usr/libexec/docker/cli-plugins
Expand Down
6 changes: 3 additions & 3 deletions deploy/iso/minikube-iso/arch/x86_64/package/Config.in
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
menu "System tools x86_64"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/buildkit-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins-latest/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/containerd-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cri-dockerd/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crictl-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins-latest/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/containerd-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/nerdctl-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-buildx/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/hyperv-daemons/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/nerdctl-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/vbox-mount-service/Config.in"
endmenu
2 changes: 1 addition & 1 deletion deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.hash
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sha256 311568ee69715abc46163fd688e56c77ab0144ff32e116d0f293bfc3470e75b7 buildx-v0.11.2.linux-amd64
sha256 3e2bc8ed25a9125d6aeec07df4e0211edea6288e075b524160ef3fd305d3d74c buildx-v0.13.1.linux-amd64
4 changes: 2 additions & 2 deletions deploy/iso/minikube-iso/arch/x86_64/package/docker-buildx/docker-buildx.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

DOCKER_BUILDX_VERSION = v0.11.2
DOCKER_BUILDX_COMMIT = 9872040b6626fb7d87ef7296fd5b832e8cc2ad17
DOCKER_BUILDX_VERSION = v0.13.1
DOCKER_BUILDX_COMMIT = 788433953af10f2a698f5c07611dddce2e08c7a0

define DOCKER_BUILDX_CONFIGURE_CMDS
mkdir -p $(TARGET_DIR)/usr/libexec/docker/cli-plugins
Expand Down

0 comments on commit 6c571d1

Please sign in to comment.