diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1acf5d6..b423830 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -124,9 +124,6 @@ ubi-release test: *test_build www-gitlab-com-2.6 test: *test_build build-git: *test_build terraform 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 # Used by go projects for linting https://gitlab.com/gitlab-org/gitlab/blob/master/doc/development/go_guide/index.md#automatic-linting golangci-lint-alpine test: *test_build # Used by gitlab-operator: https://gitlab.com/gitlab-org/gl-openshift/gitlab-operator @@ -201,9 +198,6 @@ ubi-release: *build_and_deploy www-gitlab-com-2.6: *build_and_deploy build-git: *build_and_deploy terraform: *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 # Used by go projects for linting https://gitlab.com/gitlab-org/gitlab/blob/master/doc/development/go_guide/index.md#automatic-linting golangci-lint-alpine: *build_and_deploy # Used by gitlab-operator: https://gitlab.com/gitlab-org/gl-openshift/gitlab-operator diff --git a/Dockerfile.gitlab-docs b/Dockerfile.gitlab-docs deleted file mode 100644 index b16e7e9..0000000 --- a/Dockerfile.gitlab-docs +++ /dev/null @@ -1,21 +0,0 @@ -FROM ruby:2.6.5-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" diff --git a/Dockerfile.gitlab-docs-lint b/Dockerfile.gitlab-docs-lint deleted file mode 100644 index 02db7a9..0000000 --- a/Dockerfile.gitlab-docs-lint +++ /dev/null @@ -1,25 +0,0 @@ -FROM ruby:2.6.5-alpine3.10 -MAINTAINER GitLab Documentation Team - -WORKDIR /tmp - -ENV GITLAB_DOCS_REVISION=68a38f4bf0d69b9038e5d88816eebcd6471acc19 - -RUN apk update && apk upgrade --no-cache && apk add --no-cache \ - build-base \ - bash \ - grep \ - yarn - -RUN yarn global add markdownlint-cli@0.18.0 && yarn cache clean - -# Update bundler -RUN gem install bundler -v "1.17.3" - -RUN wget https://gitlab.com/gitlab-org/gitlab-docs/-/archive/$GITLAB_DOCS_REVISION/gitlab-docs-$GITLAB_DOCS_REVISION.tar.bz2 \ - && tar xvjf gitlab-docs-$GITLAB_DOCS_REVISION.tar.bz2 \ - && mv gitlab-docs-$GITLAB_DOCS_REVISION gitlab-docs \ - && rm gitlab-docs-$GITLAB_DOCS_REVISION.tar.bz2 - -RUN cd gitlab-docs \ - && bundle install --jobs 4