Merge branch 'develop' into main

clemlesne · Apr 5, 2023 · 9549159 · 9549159
2 parents 72c147d + 3b69ffb
commit 9549159
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/pipeline.yaml b/.github/workflows/pipeline.yaml
@@ -17,10 +17,13 @@ on:
       - main
 
 env:
-  AGENT_VERSION: 3.218.0
   CONTAINER_NAME: ${{ github.repository }}
   CONTAINER_REGISTRY: ghcr.io
+  # https://github.com/microsoft/azure-pipelines-agent/releases
+  AGENT_VERSION: 3.218.0
+  # https://github.com/PowerShell/PowerShell/releases
   POWERSHELL_VERSION: 7.2.10
+  # https://github.com/mikefarah/yq/releases
   YQ_VERSION: 4.33.2
 
 jobs:

diff --git a/src/docker/Dockerfile-bullseye b/src/docker/Dockerfile-bullseye
@@ -18,6 +18,7 @@ RUN apt-get update -q \
         iputils-ping \
         jq \
         make \
+        sudo \
         tar \
         unzip \
         wget \

diff --git a/src/docker/Dockerfile-focal b/src/docker/Dockerfile-focal
@@ -18,6 +18,7 @@ RUN apt-get update -q \
         iputils-ping \
         jq \
         make \
+        sudo \
         tar \
         unzip \
         wget \

diff --git a/src/docker/Dockerfile-jammy b/src/docker/Dockerfile-jammy
@@ -18,6 +18,7 @@ RUN apt-get update -q \
         iputils-ping \
         jq \
         make \
+        sudo \
         tar \
         unzip \
         wget \

diff --git a/src/docker/Dockerfile-ubi8 b/src/docker/Dockerfile-ubi8
@@ -18,6 +18,7 @@ RUN microdnf install -y --refresh --nodocs --setopt=install_weak_deps=0 \
         iputils \
         jq \
         make \
+        sudo \
         tar \
         unzip \
         wget \

diff --git a/src/docker/start.sh b/src/docker/start.sh
@@ -22,8 +22,6 @@ if [ -n "$AZP_WORK" ]; then
   mkdir -p "$AZP_WORK"
 fi
 
-export AGENT_ALLOW_RUNASROOT="1"
-
 cleanup() {
   if [ -e config.sh ]; then
     print_header "Cleanup. Removing Azure Pipelines agent..."
@@ -45,11 +43,13 @@ print_header() {
   echo -e "${lightcyan}$1${nocolor}"
 }
 
+print_header "Configuring Azure Pipelines agent..."
+
+# Allow the agent to run as root (only feasible because the agent is running in a not-reused container)
+export AGENT_ALLOW_RUNASROOT="1"
 # Let the agent ignore the token env variables
 export VSO_AGENT_IGNORE=AZP_TOKEN,AZP_TOKEN_FILE
 
-print_header "Configuring Azure Pipelines agent..."
-
 ./config.sh --unattended \
   --acceptTeeEula \
   --agent "${AZP_AGENT_NAME:-$(hostname)}" \