Skip to content

Commit

Permalink
Reduce pulls from docker.io (#7295)
Browse files Browse the repository at this point in the history
This change reduces the number of requests we make from various build pipelines to pull images from docker.io, which will reduce the chance that we get throttled by their rate limits.
  • Loading branch information
damonbarry authored May 28, 2024
1 parent ecdfb55 commit 152cd95
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions builds/misc/templates/build-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ stages:
-e "MARINER_ARCH=$MARINER_ARCH" \
-e "VERSION=$VERSION" \
--privileged \
"ubuntu:22.04" \
'mcr.microsoft.com/mirror/docker/library/ubuntu:22.04' \
'/src/edgelet/build/linux/package-mariner.sh'
- task: CopyFiles@2
displayName: Copy iotedged build logs to artifact staging
Expand Down Expand Up @@ -331,7 +331,7 @@ stages:
-e "PACKAGE_VERSION=$packageVersion" \
-e "PACKAGE_RELEASE=1" \
--privileged \
"ubuntu:22.04" \
'mcr.microsoft.com/mirror/docker/library/ubuntu:22.04' \
'/src/ci/package.sh'
popd
sudo cp iot-identity-service/packages/mariner$(os_version)/$(arch)/aziot-identity-service-$packageVersion-1.cm$(os_version).$(arch).rpm .
Expand All @@ -347,7 +347,7 @@ stages:
-e "MARINER_ARCH=$MARINER_ARCH" \
-e "VERSION=$VERSION" \
--privileged \
"ubuntu:22.04" \
'mcr.microsoft.com/mirror/docker/library/ubuntu:22.04' \
'/src/edgelet/build/linux/package-mariner.sh'
- task: CopyFiles@2
displayName: Copy iotedged build logs to artifact staging
Expand Down
6 changes: 3 additions & 3 deletions edgelet/build/linux/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ case "$PACKAGE_OS" in
;;

'debian11')
DOCKER_IMAGE='debian:11-slim'
DOCKER_IMAGE='mcr.microsoft.com/mirror/docker/library/debian:bullseye-slim'
;;

'ubuntu20.04')
DOCKER_IMAGE='ubuntu:20.04'
DOCKER_IMAGE='mcr.microsoft.com/mirror/docker/library/ubuntu:20.04'
;;

'ubuntu22.04')
DOCKER_IMAGE='ubuntu:22.04'
DOCKER_IMAGE='mcr.microsoft.com/mirror/docker/library/ubuntu:22.04'
;;
esac

Expand Down
4 changes: 2 additions & 2 deletions scripts/linux/cross-platform-rust-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ DOCKER_VOLUME_MOUNTS=''

case "$PACKAGE_OS" in
'debian12')
DOCKER_IMAGE='debian:12-slim'
DOCKER_IMAGE='mcr.microsoft.com/mirror/docker/library/debian:bookworm-slim'
;;

'alpine')
DOCKER_IMAGE='ubuntu:20.04'
DOCKER_IMAGE='mcr.microsoft.com/mirror/docker/library/ubuntu:20.04'
;;
esac

Expand Down

0 comments on commit 152cd95

Please sign in to comment.