diff --git a/.devops/build.yml b/.devops/build.yml index a45b49d..4fb291f 100644 --- a/.devops/build.yml +++ b/.devops/build.yml @@ -84,7 +84,7 @@ extends: jobs: - job: build_internal pool: - name: JEG-azurelinux-x64-release + name: JEG-ubuntu22.04-x64-release os: linux strategy: matrix: ${{ parameters.jobs }} @@ -161,7 +161,7 @@ extends: - job: build_public dependsOn: wait_for_validation pool: - name: JEG-azurelinux-x64-release + name: JEG-ubuntu22.04-x64-release os: linux strategy: matrix: ${{ parameters.jobs }} diff --git a/docker/test-only/ubuntu/Dockerfile b/docker/test-only/ubuntu/Dockerfile index 336ab18..3601941 100644 --- a/docker/test-only/ubuntu/Dockerfile +++ b/docker/test-only/ubuntu/Dockerfile @@ -13,7 +13,8 @@ LABEL "Support"="Microsoft OpenJDK Support " ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get -qq update && \ +RUN sed -i 's|http://archive.ubuntu.com/ubuntu|http://azure.archive.ubuntu.com/ubuntu|g; s|http://security.ubuntu.com/ubuntu|http://azure.archive.ubuntu.com/ubuntu|g' /etc/apt/sources.list && \ + apt-get -qq update && \ apt-get -qq upgrade && \ apt-get -qq install --no-install-recommends tzdata ca-certificates fontconfig locales apt-transport-https wget binutils && \ echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \ diff --git a/docker/ubuntu/Dockerfile.msopenjdk-11-jdk b/docker/ubuntu/Dockerfile.msopenjdk-11-jdk index 6186008..c2b7999 100644 --- a/docker/ubuntu/Dockerfile.msopenjdk-11-jdk +++ b/docker/ubuntu/Dockerfile.msopenjdk-11-jdk @@ -10,6 +10,7 @@ ARG ms_package="msopenjdk-11 jaz" ARG PKGS="tzdata ca-certificates fontconfig locales apt-transport-https wget" RUN DEBIAN_FRONTEND=noninteractive && \ + sed -i 's|http://archive.ubuntu.com/ubuntu|http://azure.archive.ubuntu.com/ubuntu|g; s|http://security.ubuntu.com/ubuntu|http://azure.archive.ubuntu.com/ubuntu|g' /etc/apt/sources.list && \ apt-get -qq update && \ apt-get -qq upgrade && \ apt-get -qq install --no-install-recommends ${PKGS} && \ diff --git a/docker/ubuntu/Dockerfile.msopenjdk-17-jdk b/docker/ubuntu/Dockerfile.msopenjdk-17-jdk index 7693bce..fc1b3df 100644 --- a/docker/ubuntu/Dockerfile.msopenjdk-17-jdk +++ b/docker/ubuntu/Dockerfile.msopenjdk-17-jdk @@ -10,6 +10,7 @@ ARG ms_package="msopenjdk-17 jaz" ARG PKGS="tzdata ca-certificates fontconfig locales apt-transport-https wget binutils" RUN DEBIAN_FRONTEND=noninteractive && \ + sed -i 's|http://archive.ubuntu.com/ubuntu|http://azure.archive.ubuntu.com/ubuntu|g; s|http://security.ubuntu.com/ubuntu|http://azure.archive.ubuntu.com/ubuntu|g' /etc/apt/sources.list && \ apt-get -qq update && \ apt-get -qq upgrade && \ apt-get -qq install --no-install-recommends ${PKGS} && \ diff --git a/docker/ubuntu/Dockerfile.msopenjdk-21-jdk b/docker/ubuntu/Dockerfile.msopenjdk-21-jdk index 1bba671..64716a4 100644 --- a/docker/ubuntu/Dockerfile.msopenjdk-21-jdk +++ b/docker/ubuntu/Dockerfile.msopenjdk-21-jdk @@ -10,6 +10,7 @@ ARG ms_package="msopenjdk-21 jaz" ARG PKGS="tzdata ca-certificates fontconfig locales apt-transport-https wget binutils" RUN DEBIAN_FRONTEND=noninteractive && \ + sed -i 's|http://archive.ubuntu.com/ubuntu|http://azure.archive.ubuntu.com/ubuntu|g; s|http://security.ubuntu.com/ubuntu|http://azure.archive.ubuntu.com/ubuntu|g' /etc/apt/sources.list && \ apt-get -qq update && \ apt-get -qq upgrade && \ apt-get -qq install --no-install-recommends ${PKGS} && \ diff --git a/docker/ubuntu/Dockerfile.msopenjdk-25-jdk b/docker/ubuntu/Dockerfile.msopenjdk-25-jdk index a484146..72da5e4 100644 --- a/docker/ubuntu/Dockerfile.msopenjdk-25-jdk +++ b/docker/ubuntu/Dockerfile.msopenjdk-25-jdk @@ -10,6 +10,7 @@ ARG ms_package="msopenjdk-25 jaz" ARG PKGS="tzdata ca-certificates fontconfig locales apt-transport-https wget binutils" RUN DEBIAN_FRONTEND=noninteractive && \ + sed -i 's|http://archive.ubuntu.com/ubuntu|http://azure.archive.ubuntu.com/ubuntu|g; s|http://security.ubuntu.com/ubuntu|http://azure.archive.ubuntu.com/ubuntu|g' /etc/apt/sources.list && \ apt-get -qq update && \ apt-get -qq upgrade && \ apt-get -qq install --no-install-recommends ${PKGS} && \