diff --git a/gitlab-toolbox/Dockerfile b/gitlab-toolbox/Dockerfile index ed7a404c8c367bc9cec75f7a7b61e72c67eef9e9..a930926cb7cc35a7ed45127d937b596f6671bd75 100644 --- a/gitlab-toolbox/Dockerfile +++ b/gitlab-toolbox/Dockerfile @@ -13,6 +13,7 @@ FROM ${FROM_IMAGE}:${TAG} ARG AWSCLI_VERSION="1.22.44" ARG S3CMD_VERSION="2.2.0" ARG GSUTIL_VERSION="4.43" +ARG AZCOPY_VERSION="v10" COPY --from=python /usr/local/bin /usr/local/bin/ COPY --from=python /usr/local/lib /usr/local/lib/ @@ -32,6 +33,11 @@ RUN apt-get update \ && pip3 cache purge \ && find /usr/local/lib/python3.8 -name '__pycache__' -type d -print -exec rm -r {} + \ && apt-get purge -y --auto-remove gcc \ + && mkdir /tmp/azcopy \ + && curl -sL "https://aka.ms/downloadazcopy-${AZCOPY_VERSION}-linux" | \ + tar xzf - -C /tmp/azcopy --strip-components=1 \ + && cp /tmp/azcopy/azcopy /usr/local/bin && chmod 755 /usr/local/bin/azcopy \ + && rm -rf /tmp/azcopy \ && rm -rf /var/lib/apt/lists/* ARG GITLAB_USER=git diff --git a/gitlab-toolbox/Dockerfile.build.ubi8 b/gitlab-toolbox/Dockerfile.build.ubi8 index a45db934d43be77f5edeafac8eaa1945c79534e0..c21c0e5c7b7815694e388d28e0bb7c70454a0621 100644 --- a/gitlab-toolbox/Dockerfile.build.ubi8 +++ b/gitlab-toolbox/Dockerfile.build.ubi8 @@ -5,6 +5,8 @@ FROM ${BUILD_IMAGE} ARG AWSCLI_VERSION=1.22.44 ARG S3CMD_VERSION=2.2.0 ARG GSUTIL_VERSION=4.42 +ARG AZCOPY_VERSION="v10" + ARG DNF_OPTS ADD gitlab-python.tar.gz / @@ -15,6 +17,11 @@ RUN dnf ${DNF_OPTS} install -by --nodocs gcc \ && pip3 install awscli==${AWSCLI_VERSION} s3cmd==${S3CMD_VERSION} gsutil==${GSUTIL_VERSION} crcmod \ && pip3 cache purge \ && find /usr/local/lib/python3.8 -name '__pycache__' -type d -exec rm -r {} + \ + && mkdir /tmp/azcopy \ + && curl -sL "https://aka.ms/downloadazcopy-${AZCOPY_VERSION}-linux" | \ + tar xzf - -C /tmp/azcopy --strip-components=1 \ + && cp /tmp/azcopy/azcopy /usr/local/bin && chmod 755 /usr/local/bin/azcopy \ + && rm -rf /tmp/azcopy \ && mv /tmp/gitaly/usr/local/bin/gitaly-backup /usr/local/bin \ && cp -R --parents \ /usr/local/lib/python3.8/site-packages \