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

Windows multiarch #4296

Merged
merged 3 commits into from
Feb 15, 2024
Merged

Windows multiarch #4296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33d902c
Windows 2019 docker image built with a 2019 tag
atoulme Feb 15, 2024
e8ee6e2
support creating a multiarch windows image
atoulme Feb 15, 2024
27165bf
Update internal/buildscripts/packaging/release/gh-release-notes.sh
atoulme Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
77 changes: 66 additions & 11 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ sign-linux-image:
dependencies:
- push-linux-image

build-push-windows-image:
build-push-windows2019-image:
extends: .trigger-filter
stage: release
dependencies:
Expand All @@ -679,36 +679,39 @@ build-push-windows-image:
$ErrorActionPreference = 'Stop'
if ($env:CI_COMMIT_TAG) {
$IMAGE_NAME = "quay.io/signalfx/splunk-otel-collector-windows"
$IMAGE_TAG = $env:CI_COMMIT_TAG.TrimStart("v")
$tagNumber = $env:CI_COMMIT_TAG.TrimStart("v")
$IMAGE_TAG = "${tagNumber}-2019"
} else {
$IMAGE_NAME = "quay.io/signalfx/splunk-otel-collector-windows-dev"
$IMAGE_TAG = $env:CI_COMMIT_SHA
$IMAGE_TAG = "${env:CI_COMMIT_SHA}-2019"
atoulme marked this conversation as resolved.
Show resolved Hide resolved
}
$JMX_METRIC_GATHERER_RELEASE = $(Get-Content internal\buildscripts\packaging\jmx-metric-gatherer-release.txt)
echo "Building ${IMAGE_NAME}:${IMAGE_TAG}"
docker build -t ${IMAGE_NAME}:${IMAGE_TAG} --build-arg BASE_IMAGE=mcr.microsoft.com/windows/servercore:1809 --build-arg JMX_METRIC_GATHERER_RELEASE=${JMX_METRIC_GATHERER_RELEASE} -f .\cmd\otelcol\Dockerfile.windows .\cmd\otelcol\
$os_version=$(docker manifest inspect mcr.microsoft.com/windows/servercore:1809 | jq '.manifests[0].platform."os.version"')
docker manifest annotate --os "windows" --arch "amd64" --os-version "$os_version" ${IMAGE_NAME}:${IMAGE_TAG}
echo "Pushing ${IMAGE_NAME}:${IMAGE_TAG}"
docker push ${IMAGE_NAME}:${IMAGE_TAG}
echo "${IMAGE_NAME}:${IMAGE_TAG}" >> tags
if ($env:CI_COMMIT_BRANCH -eq "main" -or $env:CI_COMMIT_TAG -match '^v\d+\.\d+\.\d+$') {
# only push latest tag for main and stable releases; no need to sign them as signing is made for digest
echo "Tagging and pushing ${IMAGE_NAME}:latest"
docker tag ${IMAGE_NAME}:${IMAGE_TAG} ${IMAGE_NAME}:latest
docker push ${IMAGE_NAME}:latest
echo "Tagging and pushing ${IMAGE_NAME}:latest-2019"
docker tag ${IMAGE_NAME}:${IMAGE_TAG} ${IMAGE_NAME}:latest-2019
docker push ${IMAGE_NAME}:latest-2019
atoulme marked this conversation as resolved.
Show resolved Hide resolved
}
- docker inspect --format='{{.RepoDigests}}' ${IMAGE_NAME}:${IMAGE_TAG} | Tee-Object -FilePath dist/windows_digest.txt
- docker inspect --format='{{.RepoDigests}}' ${IMAGE_NAME}:${IMAGE_TAG} | Tee-Object -FilePath dist/windows_2019_digest.txt
- (Get-Content -Raw -Path tags) -replace "`r`n", "`n"| Set-Content -NoNewline tags_to_sign
after_script:
- docker image prune --all --force
artifacts:
paths:
- dist/windows_digest.txt
- dist/windows_2019_digest.txt
- tags_to_sign

sign-windows-image:
sign-windows2019-image:
extends: .sign-docker
dependencies:
- build-push-windows-image
- build-push-windows2019-image

build-push-windows2022-image:
extends: .trigger-filter
Expand Down Expand Up @@ -737,6 +740,8 @@ build-push-windows2022-image:
$JMX_METRIC_GATHERER_RELEASE = $(Get-Content internal\buildscripts\packaging\jmx-metric-gatherer-release.txt)
echo "Building ${IMAGE_NAME}:${IMAGE_TAG}"
docker build -t ${IMAGE_NAME}:${IMAGE_TAG} --build-arg BASE_IMAGE=mcr.microsoft.com/windows/servercore:ltsc2022 --build-arg JMX_METRIC_GATHERER_RELEASE=${JMX_METRIC_GATHERER_RELEASE} -f .\cmd\otelcol\Dockerfile.windows .\cmd\otelcol\
$os_version=$(docker manifest inspect mcr.microsoft.com/windows/servercore:ltsc2022 | jq '.manifests[0].platform."os.version"')
docker manifest annotate --os "windows" --arch "amd64" --os-version "$os_version" ${IMAGE_NAME}:${IMAGE_TAG}
echo "Pushing ${IMAGE_NAME}:${IMAGE_TAG}"
docker push ${IMAGE_NAME}:${IMAGE_TAG}
echo "${IMAGE_NAME}:${IMAGE_TAG}" >> tags
Expand All @@ -761,6 +766,55 @@ sign-windows2022-image:
dependencies:
- build-push-windows2022-image

build-push-windows-multiarch-image:
extends: .trigger-filter
stage: release
dependencies:
- build-push-windows2019-image
- build-push-windows2022-image
tags:
- windows2022
retry: 2
script:
- docker login -u $env:CIRCLECI_QUAY_USERNAME -p $env:CIRCLECI_QUAY_PASSWORD quay.io
- |
$ErrorActionPreference = 'Stop'
if ($env:CI_COMMIT_TAG) {
$IMAGE_NAME = "quay.io/signalfx/splunk-otel-collector-windows"
$tagNumber = $env:CI_COMMIT_TAG.TrimStart("v")
$IMAGE_TAG = "${tagNumber}"
} else {
$IMAGE_NAME = "quay.io/signalfx/splunk-otel-collector-windows-dev"
$IMAGE_TAG = "${env:CI_COMMIT_SHA}"
}
echo "Building ${IMAGE_NAME}:${IMAGE_TAG}"
docker pull ${IMAGE_NAME}:${IMAGE_TAG}-2019
docker pull ${IMAGE_NAME}:${IMAGE_TAG}-2022
docker manifest create ${IMAGE_NAME}:${IMAGE_TAG} --amend ${IMAGE_NAME}:${IMAGE_TAG}-2019 --amend ${IMAGE_NAME}:${IMAGE_TAG}-2022
atoulme marked this conversation as resolved.
Show resolved Hide resolved
echo "Pushing ${IMAGE_NAME}:${IMAGE_TAG}"
docker manifest push ${IMAGE_NAME}:${IMAGE_TAG}
echo "${IMAGE_NAME}:${IMAGE_TAG}" >> tags
if ($env:CI_COMMIT_BRANCH -eq "main" -or $env:CI_COMMIT_TAG -match '^v\d+\.\d+\.\d+$') {
# only push latest tag for main and stable releases; no need to sign them as signing is made for digest
echo "Tagging and pushing ${IMAGE_NAME}:latest"
docker tag ${IMAGE_NAME}:${IMAGE_TAG} ${IMAGE_NAME}:latest
docker push ${IMAGE_NAME}:latest
}
- docker inspect --format='{{.RepoDigests}}' ${IMAGE_NAME}:${IMAGE_TAG} | Tee-Object -FilePath dist/windows_multiarch_digest.txt
- (Get-Content -Raw -Path tags) -replace "`r`n", "`n"| Set-Content -NoNewline tags_to_sign
after_script:
- docker image prune --all --force
- C:\Users\Administrator\Desktop\ops-scripts\docker-leak-check.exe -remove
artifacts:
paths:
- dist/windows_multiarch_digest.txt
- tags_to_sign

sign-windows-multiarch-image:
extends: .sign-docker
dependencies:
- build-push-windows-multiarch-image

release-debs:
extends:
- .trigger-filter
Expand Down Expand Up @@ -934,8 +988,9 @@ github-release:
- sign-msi
- sign-tar
- push-linux-image
- build-push-windows-image
- build-push-windows2019-image
- build-push-windows2022-image
- build-push-windows-multiarch-image
- choco-release
- sign-agent-bundles
script:
Expand Down
9 changes: 6 additions & 3 deletions internal/buildscripts/packaging/release/gh-release-notes.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ VERSION="$1"
LINUX_AMD64_DIGEST="${2:-${REPO_DIR}/dist/linux_amd64_digest.txt}"
LINUX_ARM64_DIGEST="${2:-${REPO_DIR}/dist/linux_arm64_digest.txt}"
LINUX_PPC64LE_DIGEST="${2:-${REPO_DIR}/dist/linux_ppc64le_digest.txt}"
WINDOWS_DIGEST="${3:-${REPO_DIR}/dist/windows_digest.txt}"
WINDOWS_2019_DIGEST="${3:-${REPO_DIR}/dist/windows_2019_digest.txt}"
WINDOWS_2022_DIGEST="${3:-${REPO_DIR}/dist/windows_2022_digest.txt}"
WINDOWS_MULTIARCH_DIGEST="${3:-${REPO_DIR}/dist/windows_multiarch_digest.txt}"
CHANGELOG="${4:-${REPO_DIR}/CHANGELOG.md}"

changes="$( awk -v version="$VERSION" '/^## / { if (p) { exit }; if ($2 == version) { p=1; next } } p && NF' "$CHANGELOG" )"
Expand All @@ -42,16 +43,18 @@ linux_amd64_digest="$( get_digest "$LINUX_AMD64_DIGEST" )"
linux_arm64_digest="$( get_digest "$LINUX_ARM64_DIGEST" )"
linux_ppc64le_digest="$( get_digest "$LINUX_PPC64LE_DIGEST" )"

windows_digest="$( get_digest "$WINDOWS_DIGEST" )"
windows_2019_digest="$( get_digest "$WINDOWS_2019_DIGEST" )"
windows_2022_digest="$( get_digest "$WINDOWS_2022_DIGEST" )"
windows_multiarch_digest="$( get_digest "$WINDOWS_MULTIARCH_DIGEST" )"

changes="""$changes

> Docker Images:
> - \`quay.io/signalfx/splunk-otel-collector:${VERSION#v}-amd64\` (digest: \`$linux_amd64_digest\`)
> - \`quay.io/signalfx/splunk-otel-collector:${VERSION#v}-arm64\` (digest: \`$linux_arm64_digest\`)
> - \`quay.io/signalfx/splunk-otel-collector:${VERSION#v}-ppc64le\` (digest: \`$linux_ppc64le_digest\`)
> - \`quay.io/signalfx/splunk-otel-collector-windows:${VERSION#v}\` (digest: \`$windows_digest\`)
> - \`quay.io/signalfx/splunk-otel-collector-windows:${VERSION#v}\` (digest: \`$windows_multiarch_digest\`)
> - \`quay.io/signalfx/splunk-otel-collector-windows:${VERSION#v}-2019\` (digest: \`$windows_2019_digest\`)
> - \`quay.io/signalfx/splunk-otel-collector-windows:${VERSION#v}-2022\` (digest: \`$windows_2022_digest\`)
"""

Expand Down