NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 10:02:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update scripts to compile arm64 based images

Browse source 
This changes all binaries to be platform dependent
instead of being amd64 hardcoded.
This commit is contained in:
Kamil Trzciński 2022-04-27 18:43:24 +02:00
parent 65292a9a9c
commit 384f6231b4
9 changed files with 91 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dockerfile.custom
View file

@ -32,7 +32,7 @@ RUN if [ -n "$GIT_VERSION" ]; then /scripts/install-git && git --version; fi
ARG CHROME_VERSION
ARG CHROME_DRIVER_VERSION
RUN if [ -n "$CHROME_VERSION" ]; then /scripts/install-chrome $CHROME_VERSION $CHROME_DRIVER_VERSION && google-chrome --version; fi
RUN if [ -n "$CHROME_VERSION" ]; then /scripts/install-chrome $CHROME_VERSION $CHROME_DRIVER_VERSION && ( google-chrome --version || chromium --version ); fi
# NodeJS and Yarn
ARG NODE_INSTALL_VERSION
@ -48,7 +48,6 @@ RUN if [ -n "$INSTALL_GOLANG_VERSION" ] ; then /scripts/install-golang "${INSTAL
# Git LFS (https://git-lfs.github.com/)
ARG LFS_VERSION
ARG LFS_DOWNLOAD_URL=https://github.com/git-lfs/git-lfs/releases/download/v${LFS_VERSION}/git-lfs-linux-amd64-v${LFS_VERSION}.tar.gz
ARG LFS_DOWNLOAD_SHA256
RUN if [ -n "$LFS_VERSION" ]; then /scripts/install-lfs && git lfs --version; fi
@ -100,6 +99,8 @@ ENV LANG=C.UTF-8 \
LANGUAGE=C \
LC_ALL=C.UTF-8
RUN /scripts/validate-binaries-architecture
# Set as env variables all versions configured
ENV RUBY_VERSION=${RUBY_VERSION} \
GIT_VERSION=${GIT_VERSION} \