Merge branch 'leipert-pin-docs-image-nanoc' into 'master'

Pin version of GitLab Docs to last known working version

See merge request gitlab-org/gitlab-build-images!211
This commit is contained in:
Sean McGivern 2019-07-30 12:56:45 +00:00
commit cda7afbf6d

View file

@ -3,7 +3,9 @@ MAINTAINER GitLab Documentation Team
WORKDIR /tmp WORKDIR /tmp
RUN apk update && apk upgrade && apk add --no-cache \ ENV GITLAB_DOCS_REVISION=09947dbfa5ed5e597233b97aee9b34621c28e1f7
RUN apk update && apk upgrade --no-cache && apk add --no-cache \
build-base \ build-base \
bash \ bash \
grep \ grep \
@ -11,10 +13,10 @@ RUN apk update && apk upgrade && apk add --no-cache \
RUN yarn global add markdownlint-cli && yarn cache clean RUN yarn global add markdownlint-cli && yarn cache clean
RUN wget https://gitlab.com/gitlab-com/gitlab-docs/-/archive/master/gitlab-docs-master.tar.bz2 \ RUN wget https://gitlab.com/gitlab-org/gitlab-docs/-/archive/$GITLAB_DOCS_REVISION/gitlab-docs-$GITLAB_DOCS_REVISION.tar.bz2 \
&& tar xvjf gitlab-docs-master.tar.bz2 \ && tar xvjf gitlab-docs-$GITLAB_DOCS_REVISION.tar.bz2 \
&& mv gitlab-docs-master gitlab-docs \ && mv gitlab-docs-$GITLAB_DOCS_REVISION gitlab-docs \
&& rm gitlab-docs-master.tar.bz2 && rm gitlab-docs-$GITLAB_DOCS_REVISION.tar.bz2
RUN cd gitlab-docs \ RUN cd gitlab-docs \
&& bundle install --jobs 4 && bundle install --jobs 4