From 7f7a946e40c2fee79b7d079319e0134429699ae0 Mon Sep 17 00:00:00 2001 From: skyamgarp <130442619+skyamgarp@users.noreply.github.com> Date: Mon, 28 Oct 2024 13:28:29 +0530 Subject: [PATCH] (CAT-2120) Update sources with bookworm-backports repo (CAT-2120) Updated Code (CAT-2120) Updates ENV variables (CAT-2120) Update condition for debian (CAT-2120) Updated if statement (CAT-2120) Update timeout minutes --- .github/workflows/template_build_deploy.yml | 2 +- apt_sysvinit-utils.dockerfile | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/template_build_deploy.yml b/.github/workflows/template_build_deploy.yml index 6ae16ff..c72d5e6 100644 --- a/.github/workflows/template_build_deploy.yml +++ b/.github/workflows/template_build_deploy.yml @@ -133,7 +133,7 @@ jobs: images: needs: select name: image (${{ matrix.image_tag }}) - timeout-minutes: 10 + timeout-minutes: 60 permissions: contents: read packages: write diff --git a/apt_sysvinit-utils.dockerfile b/apt_sysvinit-utils.dockerfile index 808558e..6e45dca 100644 --- a/apt_sysvinit-utils.dockerfile +++ b/apt_sysvinit-utils.dockerfile @@ -3,6 +3,10 @@ ARG OS_TYPE FROM $OS_TYPE:$BASE_IMAGE_TAG +# Re-declare OS_TYPE & BASE_IMAGE_TAG ARGS +ARG OS_TYPE +ARG BASE_IMAGE_TAG + ENV container docker ENV DEBIAN_FRONTEND noninteractive @@ -11,6 +15,11 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +RUN if [ "$OS_TYPE" = "debian" ] && [ "$BASE_IMAGE_TAG" = "12" ]; then \ + echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/sources.list; \ + apt update; \ + fi + RUN locale-gen en_US.UTF-8 ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en