From 78a5342809f972456436cfba68cb4c291d0efabe Mon Sep 17 00:00:00 2001 From: Travis Glenn Hansen Date: Thu, 30 Oct 2025 14:44:17 -0600 Subject: [PATCH] build windows 2022 and 2025 Signed-off-by: Travis Glenn Hansen --- .github/bin/docker-release-windows.sh | 46 +++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/bin/docker-release-windows.sh b/.github/bin/docker-release-windows.sh index 21e2e13..cc2ba72 100755 --- a/.github/bin/docker-release-windows.sh +++ b/.github/bin/docker-release-windows.sh @@ -3,7 +3,7 @@ set -e echo "$DOCKER_PASSWORD" | docker login docker.io -u "$DOCKER_USERNAME" --password-stdin -echo "$GHCR_PASSWORD" | docker login ghcr.io -u "$GHCR_USERNAME" --password-stdin +echo "$GHCR_PASSWORD" | docker login ghcr.io -u "$GHCR_USERNAME" --password-stdin export DOCKER_ORG="democraticcsi" export DOCKER_PROJECT="democratic-csi" @@ -16,29 +16,29 @@ export GHCR_REPO="ghcr.io/${GHCR_ORG}/${GHCR_PROJECT}" export MANIFEST_NAME="democratic-csi-combined:${IMAGE_TAG}" if [[ -n "${IMAGE_TAG}" ]]; then - # create local manifest to work with - buildah manifest rm "${MANIFEST_NAME}" || true - buildah manifest create "${MANIFEST_NAME}" - - # all all the existing linux data to the manifest - buildah manifest add "${MANIFEST_NAME}" --all "${DOCKER_REPO}:${IMAGE_TAG}" - buildah manifest inspect "${MANIFEST_NAME}" - - # import pre-built images - buildah pull docker-archive:democratic-csi-windows-ltsc2019.tar - buildah pull docker-archive:democratic-csi-windows-ltsc2022.tar + # create local manifest to work with + buildah manifest rm "${MANIFEST_NAME}" || true + buildah manifest create "${MANIFEST_NAME}" - # add pre-built images to manifest - buildah manifest add "${MANIFEST_NAME}" democratic-csi-windows:${GITHUB_RUN_ID}-ltsc2019 - buildah manifest add "${MANIFEST_NAME}" democratic-csi-windows:${GITHUB_RUN_ID}-ltsc2022 - buildah manifest inspect "${MANIFEST_NAME}" + # all all the existing linux data to the manifest + buildah manifest add "${MANIFEST_NAME}" --all "${DOCKER_REPO}:${IMAGE_TAG}" + buildah manifest inspect "${MANIFEST_NAME}" - # push manifest - buildah manifest push --all "${MANIFEST_NAME}" docker://${DOCKER_REPO}:${IMAGE_TAG} - buildah manifest push --all "${MANIFEST_NAME}" docker://${GHCR_REPO}:${IMAGE_TAG} + # import pre-built images + buildah pull docker-archive:democratic-csi-windows-ltsc2022.tar + buildah pull docker-archive:democratic-csi-windows-ltsc2025.tar - # cleanup - buildah manifest rm "${MANIFEST_NAME}" || true + # add pre-built images to manifest + buildah manifest add "${MANIFEST_NAME}" democratic-csi-windows:${GITHUB_RUN_ID}-ltsc2022 + buildah manifest add "${MANIFEST_NAME}" democratic-csi-windows:${GITHUB_RUN_ID}-ltsc2022 + buildah manifest inspect "${MANIFEST_NAME}" + + # push manifest + buildah manifest push --all "${MANIFEST_NAME}" docker://${DOCKER_REPO}:${IMAGE_TAG} + buildah manifest push --all "${MANIFEST_NAME}" docker://${GHCR_REPO}:${IMAGE_TAG} + + # cleanup + buildah manifest rm "${MANIFEST_NAME}" || true else - : -fi \ No newline at end of file + : +fi