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.

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

[release-1.30] Fix windows airgap image packaging #6585

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ RUN set -x && \
apk add --no-cache rpm-dev; \
fi

RUN GOCR_VERSION="v0.5.1" && \
RUN GOCR_VERSION="v0.20.2" && \
if [ "${ARCH}" = "arm64" ]; then \
wget https://github.com/google/go-containerregistry/releases/download/${GOCR_VERSION}/go-containerregistry_Linux_arm64.tar.gz && \
tar -zxvf go-containerregistry_Linux_arm64.tar.gz && \
Expand Down
8 changes: 4 additions & 4 deletions scripts/build-windows-images
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fi

mkdir -p build

WINDOWS_IMAGES=(${REGISTRY}/${REPO}/${PROG}-runtime:${DOCKERIZED_VERSION}-windows-amd64 rancher/mirrored-pause:${PAUSE_VERSION}-windows-1809-amd64 rancher/mirrored-pause:${PAUSE_VERSION}-windows-ltsc2022-amd64)
for IMAGE in "${WINDOWS_IMAGES[@]}"; do
echo "${IMAGE}" >> build/windows-images.txt
done
cat <<EOF >build/windows-images.txt
${REGISTRY}/${REPO}/${PROG}-runtime:${DOCKERIZED_VERSION}-windows-amd64
${REGISTRY}/${REPO}/mirrored-pause:${PAUSE_VERSION}
EOF
12 changes: 6 additions & 6 deletions scripts/package-windows-images
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ source ./scripts/version.sh

mkdir -p dist/artifacts

# 1809/LTSC
crane --platform windows/amd64 pull \
# ltsc1809 / Server 2019 1809
crane pull --platform windows/amd64:10.0.17763.2114 \
${REGISTRY}/${REPO}/${PROG}-runtime:${DOCKERIZED_VERSION}-windows-amd64 \
rancher/pause:${PAUSE_VERSION}-windows-1809-amd64 \
${REGISTRY}/${REPO}/mirrored-pause:${PAUSE_VERSION} \
rke2-windows-1809-amd64-images.tar

# 2022/LTSC
crane --platform windows/amd64 pull \
# ltsc2022 / Server 2022 21H2
crane pull --platform windows/amd64:10.0.20348.169 \
${REGISTRY}/${REPO}/${PROG}-runtime:${DOCKERIZED_VERSION}-windows-amd64 \
rancher/pause:${PAUSE_VERSION}-windows-ltsc2022-amd64 \
${REGISTRY}/${REPO}/mirrored-pause:${PAUSE_VERSION} \
rke2-windows-ltsc2022-amd64-images.tar

WINDOWS_TARFILES=(rke2-windows-1809-amd64-images.tar rke2-windows-ltsc2022-amd64-images.tar)
Expand Down