Merge branch 'develop' into main

clemlesne · Apr 17, 2023 · 470fa19 · 470fa19
2 parents d32b513 + 8e0fd13
commit 470fa19
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/pipeline.yaml b/.github/workflows/pipeline.yaml
@@ -95,6 +95,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          # Chart Releaser needs to have local access to "gh-pages" plus current branch
+          fetch-depth: 0
 
       - name: Configure Git
         run: |

diff --git a/src/docker/Dockerfile-bullseye b/src/docker/Dockerfile-bullseye
@@ -6,7 +6,8 @@ ENV DEBIAN_FRONTEND=noninteractive
 ENV USER root
 ENV HOME /home/${USER}
 
-# Install:
+# First, upgrade base image
+# Then, install:
 # - Azure Pipelines agent system requirements
 # - zsh, for inter-operability
 # - dbus-user-session, fuse-overlayfs, iptables, for BuildKit
@@ -16,6 +17,7 @@ RUN rm -f /etc/apt/apt.conf.d/docker-clean \
     && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
 RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked --mount=target=/var/cache,type=cache,sharing=locked \
     apt-get update -q \
+    && apt-get upgrade -y -q \
     && apt-get install -y -q --no-install-recommends \
         build-essential \
         ca-certificates \

diff --git a/src/docker/Dockerfile-focal b/src/docker/Dockerfile-focal
@@ -6,7 +6,8 @@ ENV DEBIAN_FRONTEND=noninteractive
 ENV USER root
 ENV HOME /home/${USER}
 
-# Install:
+# First, upgrade base image
+# Then, install:
 # - Azure Pipelines agent system requirements
 # - zsh, for inter-operability
 # - dbus-user-session, iptables, uidmap, for BuildKit
@@ -16,6 +17,7 @@ RUN rm -f /etc/apt/apt.conf.d/docker-clean \
     && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
 RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked --mount=target=/var/cache,type=cache,sharing=locked \
     apt-get update -q \
+    && apt-get upgrade -y -q \
     && apt-get install -y -q --no-install-recommends \
         build-essential \
         ca-certificates \

diff --git a/src/docker/Dockerfile-jammy b/src/docker/Dockerfile-jammy
@@ -6,7 +6,8 @@ ENV DEBIAN_FRONTEND=noninteractive
 ENV USER root
 ENV HOME /home/${USER}
 
-# Install:
+# First, upgrade base image
+# Then, install:
 # - Azure Pipelines agent system requirements
 # - zsh, for inter-operability
 # - dbus-user-session, iptables, uidmap, for BuildKit
@@ -16,6 +17,7 @@ RUN rm -f /etc/apt/apt.conf.d/docker-clean \
     && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
 RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked --mount=target=/var/cache,type=cache,sharing=locked \
     apt-get update -q \
+    && apt-get upgrade -y -q \
     && apt-get install -y -q --no-install-recommends \
         build-essential \
         ca-certificates \

diff --git a/src/docker/Dockerfile-ubi8 b/src/docker/Dockerfile-ubi8
@@ -4,7 +4,8 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7 as base
 ENV USER root
 ENV HOME /home/${USER}
 
-# Install:
+# First, upgrade base image
+# Then, install:
 # - Azure Pipelines agent system requirements
 # - Azure CLI system requirements (Python 3.9, plus C/Rust build tools for libs non pre-built on this platform)
 # - ASP.NET Core runtime
@@ -13,7 +14,8 @@ ENV HOME /home/${USER}
 # - gzip, make, tar, unzip, wget, yq, zip, zstd for developer ease-of-life
 # - compat-openssl10, openssl, Azure CLI doesn't work with OpenSSL 3.0 (https://github.com/Azure/azure-cli/issues/22230)
 RUN --mount=target=/var/cache/yum,type=cache,sharing=locked \
-    microdnf install -y --refresh --nodocs --setopt=install_weak_deps=0 \
+    microdnf upgrade -y --nodocs --setopt=install_weak_deps=0 --refresh \
+    && microdnf install -y --nodocs --setopt=install_weak_deps=0 \
         aspnetcore-runtime-6.0 \
         ca-certificates \
         cargo \