diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f3c7c9..6cdd851 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/Dockerfile.gitlab-docs b/Dockerfile.gitlab-docs new file mode 100644 index 0000000..e7d931f --- /dev/null +++ b/Dockerfile.gitlab-docs @@ -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}"