From a593e3951dab9dc9e307ab42b5c98ba61ff1b3ca Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Tue, 4 Feb 2025 15:20:56 +0200 Subject: [PATCH 1/5] migrate to ubuntu:25.04 --- Dockerfile | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index d4ce29f..cac250d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Use the latest version of the Ubuntu image with a specific tag for stability -FROM ubuntu:24.04 +FROM ubuntu:25.04 # Set the maintainer of the image LABEL maintainer="UDX CAG Team" @@ -21,22 +21,22 @@ USER root # Install necessary packages RUN apt-get update && \ apt-get install -y --no-install-recommends \ - tzdata=2024a-3ubuntu1.1 \ - curl=8.5.0-2ubuntu10.6 \ - bash=5.2.21-2ubuntu4 \ - apt-utils=2.7.14build2 \ - gettext=0.21-14ubuntu2 \ - gnupg=2.4.4-2ubuntu17 \ - ca-certificates=20240203 \ - lsb-release=12.0-2 \ + tzdata=2024b-6ubuntu1 \ + curl=8.11.1-1ubuntu1 \ + bash=5.2.37-1ubuntu1 \ + apt-utils=2.9.18 \ + gettext=0.23.1-1 \ + gnupg=2.4.4-2ubuntu22 \ + ca-certificates=20241223 \ + lsb-release=12.1-1 \ jq=1.7.1-3build1 \ - zip=3.0-13build1 \ - unzip=6.0-28ubuntu4 \ - nano=7.2-2build1 \ - vim=2:9.1.0016-1ubuntu7.6 \ - python3.12=3.12.3-1ubuntu0.4 \ - python3-pip=24.0+dfsg-1ubuntu1.1 \ - supervisor=4.2.5-1ubuntu0.1 && \ + zip=3.0-14ubuntu2 \ + unzip=6.0-28ubuntu6 \ + nano=8.3-1 \ + vim=2:9.1.0861-1ubuntu1 \ + python3.12=3.12.8-5 \ + python3-pip=25.0+dfsg-1 \ + supervisor=4.2.5-3 && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* @@ -57,9 +57,9 @@ RUN ARCH=$(uname -m) && \ ENV CLOUDSDK_CONFIG=/usr/local/configs/gcloud RUN ARCH=$(uname -m) && \ if [ "$ARCH" = "x86_64" ]; then \ - curl -sSL "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-507.0.0-linux-x86_64.tar.gz" -o google-cloud-sdk.tar.gz; \ + curl -sSL "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-508.0.0-linux-x86_64.tar.gz" -o google-cloud-sdk.tar.gz; \ elif [ "$ARCH" = "aarch64" ]; then \ - curl -sSL "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-507.0.0-linux-arm.tar.gz" -o google-cloud-sdk.tar.gz; \ + curl -sSL "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-508.0.0-linux-arm.tar.gz" -o google-cloud-sdk.tar.gz; \ fi && \ tar -xzf google-cloud-sdk.tar.gz && \ ./google-cloud-sdk/install.sh -q && \ @@ -83,9 +83,9 @@ RUN mkdir -p $GNUPGHOME && \ chmod 700 $GNUPGHOME && \ gpg --keyserver keyserver.ubuntu.com --recv-keys EB3E94ADBE1229CF && \ gpg --export EB3E94ADBE1229CF | tee /usr/share/keyrings/microsoft-archive-keyring.gpg && \ - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/azure-cli.list && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/azure-cli/ jammy main" | tee /etc/apt/sources.list.d/azure-cli.list && \ apt-get update && \ - apt-get install -y --no-install-recommends azure-cli=2.68.0-1~noble && \ + apt-get install -y --no-install-recommends azure-cli=2.68.0-1~jammy && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From 06e0efc0ff8f06d9df7bb60fa2942e7485242c54 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Tue, 4 Feb 2025 15:29:02 +0200 Subject: [PATCH 2/5] test multiplatform build --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 9a3266c..a72b243 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -33,7 +33,7 @@ jobs: - name: Dev Pipeline run: | echo "AZURE_CREDS=$AZURE_CREDS" > .env - make dev-pipeline + MULTIPLATFORM=true make dev-pipeline env: AZURE_CREDS: ${{ secrets.AZURE_CREDS }} working-directory: . From 96ad708f1f66be95134d060d4712591ace6f4df9 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Tue, 4 Feb 2025 15:33:04 +0200 Subject: [PATCH 3/5] test arm64 build --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4484324..2a1c75b 100644 --- a/Makefile +++ b/Makefile @@ -13,8 +13,8 @@ MULTIPLATFORM ?= false build: @echo "Building Docker image..." @if [ "$(MULTIPLATFORM)" = "true" ]; then \ - echo "Multiple platforms: [linux/amd64, linux/arm64]..."; \ - docker buildx build --platform linux/amd64,linux/arm64 -t $(DOCKER_IMAGE) --load .; \ + echo "Custom platform: [linux/arm64]..."; \ + docker buildx build --platform linux/arm64 -t $(DOCKER_IMAGE) --load .; \ else \ echo "Only local platform..."; \ docker build -t $(DOCKER_IMAGE) .; \ From 260e8cf8dd652db174487b6591acda30d2764316 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Tue, 4 Feb 2025 16:17:42 +0200 Subject: [PATCH 4/5] improve packages installation --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cac250d..b5c27a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ USER root # Install necessary packages RUN apt-get update && \ - apt-get install -y --no-install-recommends \ + apt-get install -y \ tzdata=2024b-6ubuntu1 \ curl=8.11.1-1ubuntu1 \ bash=5.2.37-1ubuntu1 \ From a783ebc949468dda54f115f783758f0497bcc642 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Tue, 4 Feb 2025 16:45:06 +0200 Subject: [PATCH 5/5] ignore DL3015 warning --- .github/workflows/build-and-test.yml | 2 +- Dockerfile | 1 + Makefile | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index a72b243..9a3266c 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -33,7 +33,7 @@ jobs: - name: Dev Pipeline run: | echo "AZURE_CREDS=$AZURE_CREDS" > .env - MULTIPLATFORM=true make dev-pipeline + make dev-pipeline env: AZURE_CREDS: ${{ secrets.AZURE_CREDS }} working-directory: . diff --git a/Dockerfile b/Dockerfile index b5c27a8..7a4fb7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] USER root # Install necessary packages +# hadolint ignore=DL3015 RUN apt-get update && \ apt-get install -y \ tzdata=2024b-6ubuntu1 \ diff --git a/Makefile b/Makefile index 2a1c75b..4484324 100644 --- a/Makefile +++ b/Makefile @@ -13,8 +13,8 @@ MULTIPLATFORM ?= false build: @echo "Building Docker image..." @if [ "$(MULTIPLATFORM)" = "true" ]; then \ - echo "Custom platform: [linux/arm64]..."; \ - docker buildx build --platform linux/arm64 -t $(DOCKER_IMAGE) --load .; \ + echo "Multiple platforms: [linux/amd64, linux/arm64]..."; \ + docker buildx build --platform linux/amd64,linux/arm64 -t $(DOCKER_IMAGE) --load .; \ else \ echo "Only local platform..."; \ docker build -t $(DOCKER_IMAGE) .; \