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

Fix the gitlab-docs image by properly basing it on 'ruby:2.6.3-alpine-3.10'

Browse source 
Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
Rémy Coutable 2019-10-01 10:39:08 +02:00
parent c72346c51d
commit 946c2425f9
No known key found for this signature in database
GPG key ID: 98DFFD1C0C62B70B
2 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci.yml
View file

@ -73,9 +73,6 @@ ruby-2.6.3-git-2.22-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.33-docker
# Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
ruby-2.6.3-git-2.22-chrome-74.0-node-12.x-yarn-1.16-docker-19.03.1 test: *test_custom
# Used by gitlab-docs: https://gitlab.com/gitlab-org/gitlab-docs/blob/master/.gitlab-ci.yml
ruby-2.6.3-alpine-3.10-node-12.x-yarn-1.16 test: *test_custom
# Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
ruby-2.3-ansible-2.5.1-terraform-0.11 test: *test_custom
@ -101,6 +98,8 @@ omnibus-gitlab-depscan test: *test_build
release-tools test: *test_build
sitespeed-gitlab test: *test_build
www-gitlab-com-2.6 test: *test_build
# Used by gitlab-docs: https://gitlab.com/gitlab-org/gitlab-docs/blob/master/.gitlab-ci.yml
gitlab-docs test: *test_build
gitlab-docs-lint test: *test_build
# Builds
@ -125,9 +124,6 @@ ruby-2.6.3-git-2.22-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.33-docker
# Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
ruby-2.6.3-git-2.22-chrome-74.0-node-12.x-yarn-1.16-docker-19.03.1: *build_and_deploy_custom
# Used by gitlab-docs: https://gitlab.com/gitlab-org/gitlab-docs/blob/master/.gitlab-ci.yml
ruby-2.6.3-alpine-3.10-node-12.x-yarn-1.16: *build_and_deploy_custom
# Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
ruby-2.3-ansible-2.5.1-terraform-0.11: *build_and_deploy_custom
@ -153,6 +149,8 @@ omnibus-gitlab-depscan: *build_and_deploy
release-tools: *build_and_deploy
sitespeed-gitlab: *build_and_deploy
www-gitlab-com-2.6: *build_and_deploy
# Used by gitlab-docs: https://gitlab.com/gitlab-org/gitlab-docs/blob/master/.gitlab-ci.yml
gitlab-docs: *build_and_deploy
gitlab-docs-lint: *build_and_deploy
cache-google-chrome:

26
Dockerfile.gitlab-docs Normal file
View file

@ -0,0 +1,26 @@
FROM ruby:2.6.3-alpine3.10
MAINTAINER GitLab Documentation Team
ENV NODE_VERSION="12.11.0"
ENV NODE_ARCHIVE_FILE="node-v${NODE_VERSION}-linux-x64.tar.xz"
ENV NODE_URL="https://nodejs.org/dist/v${NODE_VERSION}/${NODE_ARCHIVE_FILE}"
ENV YARN_VERSION="1.19.0"
ENV YARN_ARCHIVE_FILE="yarn-v${YARN_VERSION}.tar.gz"
ENV YARN_URL="https://yarnpkg.com/downloads/${YARN_VERSION}/${YARN_ARCHIVE_FILE}"
# Install dependencies
RUN apk --no-cache add -U openssl tar gzip xz gnupg bash \
&& mkdir -p /opt
# Install NodeJS
RUN mkdir -p /usr/local/lib/nodejs \
&& wget "${NODE_URL}" \
&& tar -xvf "${NODE_ARCHIVE_FILE}" -C /usr/local/lib/nodejs
# Install Yarn
RUN wget "${YARN_URL}" \
&& wget -qO- https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --import \
&& wget "${YARN_URL}".asc \
&& gpg --verify "${YARN_ARCHIVE_FILE}".asc \
&& tar zvxf "${YARN_ARCHIVE_FILE}"