@@ -98,6 +98,14 @@ NERDCTL_LATEST=$(get_latest_tag "containerd/nerdctl")
9898NERDCTL_COMMIT=$( get_commit_for_tag " containerd/nerdctl" " $NERDCTL_LATEST " )
9999update_dependency " NERDCTL" " $NERDCTL_LATEST " " $NERDCTL_COMMIT "
100100
101+ # Get nerdctl dockerfile content
102+ echo " Getting nerdctl dockerfile content..."
103+ NERDCTL_DOCKERFILE=$( get_nerdctl_dockerfile " $NERDCTL_LATEST " )
104+
105+ # Get BuildKit version from nerdctl Dockerfile
106+ echo " Getting BuildKit version from nerdctl Dockerfile..."
107+ BUILDKIT_VERSION=$( get_buildkit_version " $NERDCTL_DOCKERFILE " )
108+
101109# Update buildkit with version from nerdctl
102110echo " Updating buildkit to version $BUILDKIT_VERSION ..."
103111BUILDKIT_COMMIT=$( get_commit_for_tag " moby/buildkit" " $BUILDKIT_VERSION " )
@@ -109,24 +117,16 @@ SOCI_LATEST=$(get_latest_tag "awslabs/soci-snapshotter")
109117SOCI_COMMIT=$( get_commit_for_tag " awslabs/soci-snapshotter" " $SOCI_LATEST " )
110118update_dependency " SOCI" " $SOCI_LATEST " " $SOCI_COMMIT "
111119
112- # Get nerdctl dockerfile content
113- echo " Getting nerdctl dockerfile content..."
114- NERDCTL_DOCKERFILE=$( get_nerdctl_dockerfile " $NERDCTL_LATEST " )
115-
116- # Get BuildKit version from nerdctl Dockerfile
117- echo " Getting BuildKit version from nerdctl Dockerfile..."
118- BUILDKIT_VERSION=$( get_buildkit_version " $NERDCTL_DOCKERFILE " )
119-
120- # Get Cosign version from nerdctl Dockerfile
121- echo " Getting Cosign version from nerdctl Dockerfile..."
122- COSIGN_VERSION=$( get_cosign_version " $NERDCTL_DOCKERFILE " )
123-
124120# Update CNI plugins
125121echo " Updating CNI plugins..."
126122CNI_LATEST=$( get_cni_plugin_version " $NERDCTL_DOCKERFILE " )
127123CNI_COMMIT=$( get_commit_for_tag " containernetworking/plugins" " $CNI_LATEST " )
128124update_dependency " CNI" " $CNI_LATEST " " $CNI_COMMIT "
129125
126+ # Get Cosign version from nerdctl Dockerfile
127+ echo " Getting Cosign version from nerdctl Dockerfile..."
128+ COSIGN_VERSION=$( get_cosign_version " $NERDCTL_DOCKERFILE " )
129+
130130# Update cosign with version from nerdctl
131131echo " Updating cosign to version $COSIGN_VERSION ..."
132132if [ -n " $COSIGN_VERSION " ]; then
0 commit comments