Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-docs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-08-29 13:49:12 +0300
committerAchilleas Pipinellis <axil@gitlab.com>2019-08-29 13:49:12 +0300
commitfa6cff498a45e6844f49c987663d1174a45c83a7 (patch)
tree6a193866144ecaff549b293bb71a2766ed4b3803 /dockerfiles
parent31a4d3ff7f6ff530a173791ca343d77895ae6dcc (diff)
Install Alpine packages before bundle install
They include Git, which we need to have installed if bundler pulls from a Git source.
Diffstat (limited to 'dockerfiles')
-rw-r--r--dockerfiles/Dockerfile.bootstrap6
1 files changed, 3 insertions, 3 deletions
diff --git a/dockerfiles/Dockerfile.bootstrap b/dockerfiles/Dockerfile.bootstrap
index fc9b5359d..784e8fe9b 100644
--- a/dockerfiles/Dockerfile.bootstrap
+++ b/dockerfiles/Dockerfile.bootstrap
@@ -11,6 +11,9 @@ RUN apk add --no-cache --virtual build-deps \
ruby-dev \
libxslt-dev
+# Install packages needed at build and run time
+RUN apk add --no-cache libxslt libcurl openssl git grep bash pngquant
+
# Do not install rdoc to save some space
RUN echo 'gem: --no-document' >> /etc/gemrc
@@ -24,7 +27,4 @@ WORKDIR /source
# Install gems
RUN NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --jobs 4
-# Install packages needed at build and run time
-RUN apk add --no-cache libxslt libcurl openssl git grep bash pngquant
-
CMD echo "Nothing to do here. This is the bootstrap image that contains all dependencies to build the docs site."