Merge remote-tracking branch 'origin/master' into main-jh

ci_files/variables.yml

@@ -42,7 +42,7 @@ variables:
   CA_PKG_VERSION: "20220614-r0"
   CFSSL_VERSION: "1.6.1"
   CFSSL_CHECKSUM_SHA256: "89e600cd5203a025f8b47c6cd5abb9a74b06e3c7f7f7dd3f5b2a00975b15a491"
-  AWSCLI_VERSION: "1.33.29"
+  AWSCLI_VERSION: "1.33.30"
   S3CMD_VERSION: "2.4.0"
   GM_VERSION: "1.3.36"
   GM_CHECKSUM_SHA256: "5d5b3fde759cdfc307aaf21df9ebd8c752e3f088bb051dd5df8aac7ba7338f46"

gitaly/Dockerfile

@@ -57,15 +57,15 @@ RUN buildDeps=' \
     rm gitaly.tar.gz && \
     if [ -n "${GITALY_GIT_REPO_URL}" ]; then export GIT_REPO_URL="${GITALY_GIT_REPO_URL}" ; fi && \
     make install WITH_BUNDLED_GIT=YesPlease && \
+    # Build `gitaly-init-cgroups`
+    CGO_ENABLED=0 go build -C "${BUILD_DIR}/tools/gitaly-init-cgroups" -trimpath -o /usr/local/bin/setup_cgroups . && \
+    # Copy binaries to /target
     mkdir /target && \
     cp -R --parents \
       /usr/local/bin/gitaly* \
       /usr/local/bin/praefect \
-      /target && \
-    mkdir -p ${BUILD_DIR}/app && \
-    cp ./tools/gitaly-init-cgroups/main.go ${BUILD_DIR}/app/main.go && \
-    cd ${BUILD_DIR}/app && \ 
-    GO111MODULE=off CGO_ENABLED=0 go build -o /target/usr/local/bin/setup_cgroups . 
+      /usr/local/bin/setup_cgroups \
+      /target
 
 ## FINAL IMAGE ##
 ARG GITLAB_BASE_IMAGE

gitlab-toolbox/Dockerfile

@@ -12,7 +12,7 @@ FROM --platform=$TARGETPLATFORM ${GITALY_IMAGE} AS gitaly
 
 FROM --platform=$TARGETPLATFORM ${FROM_IMAGE}:${TAG}
 
-ARG AWSCLI_VERSION="1.33.29"
+ARG AWSCLI_VERSION="1.33.30"
 ARG S3CMD_VERSION="2.4.0"
 ARG GSUTIL_VERSION="5.29"
 ARG AZCOPY_VERSION="v10"