Merge remote-tracking branch 'upstream/main'

Author: gounthar

.github/workflows/github-docker-registry-push.yml

@@ -213,4 +213,4 @@ jobs:
           context: ./dockerfiles/cpp
           platforms: linux/amd64, linux/aarch64
           push: true
-          tags: ghcr.io/${{ env.REPO_NAME }}/jenkinsci-tutorials:cpp__${{ env.BRANCH }}
+          tags: ghcr.io/${{ env.REPO_NAME }}/jenkinsci-tutorials:cpp_${{ env.BRANCH }}

dockerfiles/cpp/Dockerfile

@@ -1,8 +1,5 @@
 FROM jenkins/ssh-agent:6.9.0
 
-ARG TARGETARCH
-ENV ARCHITECTURE=$TARGETARCH
-
 # Install necessary C++ build tools
 RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential \