diff options
author | Marcel Amirault <mamirault@gitlab.com> | 2019-12-26 12:46:44 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-12-26 12:46:44 +0300 |
commit | c466046bc12a35b9178c0a56e7860d50edf8fc48 (patch) | |
tree | 1e79a63f1f5947ab0ce1fb66af08a6a55b310c0a | |
parent | e9695ea51cad5168c80e802db92479538141140e (diff) |
Docs build images
-rw-r--r-- | .gitlab-ci.yml | 38 | ||||
-rw-r--r-- | dockerfiles/Dockerfile.gitlab-docs | 21 |
2 files changed, 46 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92fc0eff..759be70d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-docs +image: registry.gitlab.com/gitlab-org/gitlab-docs:gitlab-docs stages: - build-images @@ -326,18 +326,30 @@ pages: # # GitLab docs lint image containing all test tools # -# image:docs-lint: -# <<: *docker_prepare -# stage: pre-deploy -# variables: -# IMAGE_NAME: $CI_REGISTRY_IMAGE:lint -# DOCKERFILE: dockerfiles/Dockerfile.gitlab-docs-lint -# script: -# - docker build -t $IMAGE_NAME -f $DOCKERFILE . -# - docker push $IMAGE_NAME -# only: -# - schedules -# - master +image:docs-lint: + <<: *docker_prepare + <<: *scheduled_infrequent + stage: build-images + variables: + IMAGE_NAME: $CI_REGISTRY_IMAGE:lint + DOCKERFILE: dockerfiles/Dockerfile.gitlab-docs-lint + script: + - docker build -t $IMAGE_NAME -f $DOCKERFILE . + - docker push $IMAGE_NAME + +# +# GitLab docs image +# +image:gitlab-docs: + <<: *docker_prepare + <<: *scheduled_infrequent + stage: build-images + variables: + IMAGE_NAME: $CI_REGISTRY_IMAGE:gitlab-docs + DOCKERFILE: dockerfiles/Dockerfile.gitlab-docs + script: + - docker build -t $IMAGE_NAME -f $DOCKERFILE . + - docker push $IMAGE_NAME # # Helper Docker image containing all build dependencies. diff --git a/dockerfiles/Dockerfile.gitlab-docs b/dockerfiles/Dockerfile.gitlab-docs new file mode 100644 index 00000000..de927798 --- /dev/null +++ b/dockerfiles/Dockerfile.gitlab-docs @@ -0,0 +1,21 @@ +FROM ruby:2.6.3-alpine3.10 +MAINTAINER GitLab Documentation Team + +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}" +ENV PATH $PATH:/yarn-v${YARN_VERSION}/bin + +# Install dependencies +RUN apk --no-cache add -U openssl tar gzip xz gnupg bash nodejs \ + && mkdir -p /opt + +# 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}" + +# Update bundler +RUN gem install bundler -v "1.17.3" |