diff --git a/.circleci/config.yml b/.circleci/config.yml index d4c2a00fa3..acf48e30d7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -148,22 +148,6 @@ jobs: - GO_VERSION: 1.17.9 - GOFUMPT_VERSION: 0.2.1 - GOTESTSUM_VERSION: 0.5.2 - algolia-index: - docker: - - image: node:14 - steps: - - checkout - - run: - command: | - if [ "$CIRCLE_REPOSITORY_URL" != "git@github.com:hashicorp/vault.git" ]; then - echo "Not Vault OSS Repo, not indexing Algolia" - exit 0 - fi - cd website/ - npm install -g npm@latest - npm install - node scripts/index_search_content.js - name: Push content to Algolia Index test-go-remote-docker: docker: - image: docker.mirror.hashicorp.services/cimg/go:1.17.9 @@ -588,29 +572,6 @@ jobs: environment: - CIRCLECI_CLI_VERSION: 0.1.5546 - GO_TAGS: '' - website-docker-image: - docker: - - image: circleci/buildpack-deps - shell: /usr/bin/env bash -euo pipefail -c - steps: - - checkout - - setup_remote_docker - - run: - command: | - IMAGE_TAG="$(git rev-list -n1 HEAD -- website/Dockerfile website/package-lock.json)" - echo "Using $IMAGE_TAG" - if [ "$CIRCLE_REPOSITORY_URL" != "git@github.com:hashicorp/vault.git" ]; then - echo "Not Vault OSS Repo, not building website docker image" - elif curl https://hub.docker.com/v2/repositories/hashicorp/vault-website/tags/$IMAGE_TAG -fsL > /dev/null; then - echo "Dependencies have not changed, not building a new website docker image." - else - cd website/ - docker build -t hashicorp/vault-website:$IMAGE_TAG . - docker tag hashicorp/vault-website:$IMAGE_TAG hashicorp/vault-website:latest - docker login -u $WEBSITE_DOCKER_USER -p $WEBSITE_DOCKER_PASS - docker push hashicorp/vault-website - fi - name: Build Docker Image if Necessary test-go: docker: - image: docker.mirror.hashicorp.services/cimg/go:1.17.9 @@ -1137,18 +1098,6 @@ workflows: - test-go-race-remote-docker: requires: - pre-flight-checks - - website-docker-image: - filters: - branches: - only: - - main - context: vault-docs - - algolia-index: - filters: - branches: - only: - - stable-website - context: vault-docs - semgrep: requires: - pre-flight-checks diff --git a/.circleci/config/jobs/algolia-index.yml b/.circleci/config/jobs/algolia-index.yml deleted file mode 100644 index cd02bdd63a..0000000000 --- a/.circleci/config/jobs/algolia-index.yml +++ /dev/null @@ -1,15 +0,0 @@ -docker: - - image: node:14 -steps: - - checkout - - run: - name: Push content to Algolia Index - command: | - if [ "$CIRCLE_REPOSITORY_URL" != "git@github.com:hashicorp/vault.git" ]; then - echo "Not Vault OSS Repo, not indexing Algolia" - exit 0 - fi - cd website/ - npm install -g npm@latest - npm install - node scripts/index_search_content.js diff --git a/.circleci/config/jobs/website-docker-image.yml b/.circleci/config/jobs/website-docker-image.yml deleted file mode 100644 index c3aac13cf8..0000000000 --- a/.circleci/config/jobs/website-docker-image.yml +++ /dev/null @@ -1,22 +0,0 @@ -docker: - - image: circleci/buildpack-deps -shell: /usr/bin/env bash -euo pipefail -c -steps: - - checkout - - setup_remote_docker - - run: - name: Build Docker Image if Necessary - command: | - IMAGE_TAG="$(git rev-list -n1 HEAD -- website/Dockerfile website/package-lock.json)" - echo "Using $IMAGE_TAG" - if [ "$CIRCLE_REPOSITORY_URL" != "git@github.com:hashicorp/vault.git" ]; then - echo "Not Vault OSS Repo, not building website docker image" - elif curl https://hub.docker.com/v2/repositories/hashicorp/vault-website/tags/$IMAGE_TAG -fsL > /dev/null; then - echo "Dependencies have not changed, not building a new website docker image." - else - cd website/ - docker build -t hashicorp/vault-website:$IMAGE_TAG . - docker tag hashicorp/vault-website:$IMAGE_TAG hashicorp/vault-website:latest - docker login -u $WEBSITE_DOCKER_USER -p $WEBSITE_DOCKER_PASS - docker push hashicorp/vault-website - fi diff --git a/.circleci/config/workflows/ci.yml b/.circleci/config/workflows/ci.yml index 7eebfff523..3af59741a6 100644 --- a/.circleci/config/workflows/ci.yml +++ b/.circleci/config/workflows/ci.yml @@ -38,18 +38,6 @@ jobs: - test-go-race-remote-docker: requires: - pre-flight-checks - - website-docker-image: - context: vault-docs - filters: - branches: - only: - - main - - algolia-index: - context: vault-docs - filters: - branches: - only: - - stable-website - semgrep: requires: - pre-flight-checks diff --git a/website/README.md b/website/README.md index 3722f8cf1c..d895a340ed 100644 --- a/website/README.md +++ b/website/README.md @@ -1,6 +1,6 @@ # Vault Website -This subdirectory contains the entire source for the [Vault Website](https://vaultproject.io/). This is a [NextJS](https://nextjs.org/) project, which builds a static site from these source files. +This subdirectory contains the content for the [Vault Website](https://vaultproject.io/).