mirror of
https://ops.gitlab.net/gitlab-org/gitlab-build-images.git
synced 2025-12-09 10:02:56 +01:00
Set ENV once, at end
This commit is contained in:
parent
2269f81b22
commit
1f070817cd
1 changed files with 18 additions and 16 deletions
|
|
@ -16,7 +16,6 @@ ENV PATH $PATH:/usr/local/go/bin
|
|||
# Ruby
|
||||
ARG RUBY_VERSION
|
||||
ARG RUBY_DOWNLOAD_SHA256
|
||||
ENV RUBY_VERSION=${RUBY_VERSION}
|
||||
|
||||
RUN if [ -n "$RUBY_VERSION" ]; then /scripts/install-ruby $RUBY_VERSION $RUBY_DOWNLOAD_SHA256 && ruby --version; fi
|
||||
|
||||
|
|
@ -24,7 +23,6 @@ RUN if [ -n "$RUBY_VERSION" ]; then /scripts/install-ruby $RUBY_VERSION $RUBY_DO
|
|||
ARG GIT_VERSION
|
||||
ARG GIT_DOWNLOAD_URL
|
||||
ARG GIT_DOWNLOAD_SHA256
|
||||
ENV GIT_VERSION=${GIT_VERSION}
|
||||
|
||||
RUN if [ -n "$GIT_VERSION" ]; then /scripts/install-pcre2 && pcre2-config --version; fi
|
||||
RUN if [ -n "$GIT_VERSION" ]; then /scripts/install-git && git --version; fi
|
||||
|
|
@ -32,22 +30,18 @@ RUN if [ -n "$GIT_VERSION" ]; then /scripts/install-git && git --version; fi
|
|||
# Chrome
|
||||
ARG CHROME_VERSION
|
||||
ARG CHROME_DRIVER_VERSION
|
||||
ENV CHROME_VERSION=${CHROME_VERSION}
|
||||
|
||||
RUN if [ -n "$CHROME_VERSION" ]; then /scripts/install-chrome $CHROME_VERSION $CHROME_DRIVER_VERSION && google-chrome --version; fi
|
||||
|
||||
# NodeJS and Yarn
|
||||
ARG NODE_INSTALL_VERSION
|
||||
ARG YARN_INSTALL_VERSION
|
||||
ENV NODE_VERSION=${NODE_INSTALL_VERSION} \
|
||||
YARN_VERSION=${YARN_INSTALL_VERSION}
|
||||
|
||||
RUN if [ -n "$NODE_INSTALL_VERSION" ] ; then /scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version; fi
|
||||
|
||||
# Golang
|
||||
ARG INSTALL_GOLANG_VERSION
|
||||
ARG GOLANG_DOWNLOAD_SHA256
|
||||
ENV GOLANG_VERSION=${INSTALL_GOLANG_VERSION}
|
||||
|
||||
RUN if [ -n "$INSTALL_GOLANG_VERSION" ] ; then /scripts/install-golang "${INSTALL_GOLANG_VERSION}" "${GOLANG_DOWNLOAD_SHA256}" && go version; fi
|
||||
|
||||
|
|
@ -55,26 +49,22 @@ RUN if [ -n "$INSTALL_GOLANG_VERSION" ] ; then /scripts/install-golang "${INSTAL
|
|||
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
|
||||
ENV LFS_VERSION=${LFS_VERSION}
|
||||
|
||||
RUN if [ -n "$LFS_VERSION" ]; then /scripts/install-lfs && git lfs --version; fi
|
||||
|
||||
# Postgres
|
||||
ARG POSTGRES_VERSION
|
||||
ENV POSTGRES_VERSION=${POSTGRES_VERSION}
|
||||
|
||||
RUN if [ -n "$POSTGRES_VERSION" ] ; then /scripts/install-postgresql $POSTGRES_VERSION; fi
|
||||
|
||||
# Ansible
|
||||
ARG ANSIBLE_VERSION
|
||||
ENV ANSIBLE_VERSION=${ANSIBLE_VERSION}
|
||||
|
||||
RUN if [ -n "$ANSIBLE_VERSION" ] ; then /scripts/install-ansible $ANSIBLE_VERSION; fi
|
||||
|
||||
# Terraform
|
||||
ARG TERRAFORM_VERSION
|
||||
ARG TERRAFORM_DOWNLOAD_SHA256
|
||||
ENV TERRAFORM_VERSION=${TERRAFORM_VERSION}
|
||||
|
||||
RUN if [ -n "$TERRAFORM_VERSION" ] ; then /scripts/install-terraform $TERRAFORM_VERSION $TERRAFORM_DOWNLOAD_SHA256; fi
|
||||
|
||||
|
|
@ -82,24 +72,36 @@ RUN if [ -n "$TERRAFORM_VERSION" ] ; then /scripts/install-terraform $TERRAFORM_
|
|||
ARG GRAPHISMAGICK_VERSION
|
||||
ARG GRAPHISMAGICK_DOWNLOAD_URL=https://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/${GRAPHISMAGICK_VERSION}/GraphicsMagick-${GRAPHISMAGICK_VERSION}.tar.gz
|
||||
ARG GRAPHISMAGICK_DOWNLOAD_SHA256
|
||||
ENV GRAPHISMAGICK_VERSION=${GRAPHISMAGICK_VERSION}
|
||||
|
||||
RUN if [ -n "$GRAPHISMAGICK_VERSION" ]; then /scripts/install-graphicsmagick && gm version; fi
|
||||
|
||||
# Docker
|
||||
ARG DOCKER_VERSION
|
||||
ENV DOCKER_VERSION=${DOCKER_VERSION}
|
||||
|
||||
RUN if [ -n "$DOCKER_VERSION" ]; then /scripts/install-docker $DOCKER_VERSION; fi
|
||||
|
||||
# PgBouncer
|
||||
ARG PGBOUNCER_VERSION
|
||||
ARG PGBOUNCER_DOWNLOAD_SHA256
|
||||
ENV PGBOUNCER_VERSION=${PGBOUNCER_VERSION}
|
||||
|
||||
RUN if [ -n "$PGBOUNCER_VERSION" ] ; then /scripts/install-pgbouncer $PGBOUNCER_VERSION $PGBOUNCER_DOWNLOAD_SHA256; fi
|
||||
|
||||
RUN locale-gen en_US.UTF-8
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV LANGUAGE en_US:en
|
||||
ENV LC_ALL en_US.UTF-8
|
||||
ENV LANG=en_US.UTF-8 \
|
||||
LANGUAGE=en_US:en \
|
||||
LC_ALL=en_US.UTF-8
|
||||
|
||||
# Set as env variables all versions configured
|
||||
ENV RUBY_VERSION=${RUBY_VERSION} \
|
||||
GIT_VERSION=${GIT_VERSION} \
|
||||
CHROME_VERSION=${CHROME_VERSION} \
|
||||
NODE_VERSION=${NODE_INSTALL_VERSION} \
|
||||
YARN_VERSION=${YARN_INSTALL_VERSION} \
|
||||
GOLANG_VERSION=${INSTALL_GOLANG_VERSION} \
|
||||
LFS_VERSION=${LFS_VERSION} \
|
||||
POSTGRES_VERSION=${POSTGRES_VERSION} \
|
||||
ANSIBLE_VERSION=${ANSIBLE_VERSION} \
|
||||
TERRAFORM_VERSION=${TERRAFORM_VERSION} \
|
||||
GRAPHISMAGICK_VERSION=${GRAPHISMAGICK_VERSION} \
|
||||
DOCKER_VERSION=${DOCKER_VERSION} \
|
||||
PGBOUNCER_VERSION=${PGBOUNCER_VERSION}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue