From a086f0c1a57389eb56097e804553e1bf0cc7fc41 Mon Sep 17 00:00:00 2001 From: Dylan Staley <88163+dstaley@users.noreply.github.com> Date: Thu, 16 Dec 2021 16:10:17 -0800 Subject: [PATCH] update make website workflow --- Makefile | 21 +++++++-------------- website/README.md | 2 +- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index aa29d3696..dc7272134 100644 --- a/Makefile +++ b/Makefile @@ -27,25 +27,18 @@ exhaustive: @sh -c "'$(CURDIR)/scripts/exhaustive.sh'" website: -ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO))) - echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..." - git clone https://$(WEBSITE_REPO) $(GOPATH)/src/$(WEBSITE_REPO) -endif - $(eval WEBSITE_PATH := $(GOPATH)/src/$(WEBSITE_REPO)) + @echo "==> Downloading latest Docker image..." + @docker pull hashicorp/terraform-website:full @echo "==> Starting core website in Docker..." @docker run \ --interactive \ --rm \ --tty \ - --publish "4567:4567" \ - --publish "35729:35729" \ - --volume "$(shell pwd)/website:/website" \ - --volume "$(shell pwd):/ext/terraform" \ - --volume "$(WEBSITE_PATH)/content:/terraform-website" \ - --volume "$(WEBSITE_PATH)/content/source/assets:/website/docs/assets" \ - --volume "$(WEBSITE_PATH)/content/source/layouts:/website/docs/layouts" \ - --workdir /terraform-website \ - hashicorp/middleman-hashicorp:${VERSION} + --workdir "/website" \ + --volume "$(shell pwd):/website/ext/terraform" \ + --publish "3000:3000" \ + hashicorp/terraform-website:full \ + npm start # disallow any parallelism (-j) for Make. This is necessary since some # commands during the build process create temporary files that collide diff --git a/website/README.md b/website/README.md index 036fa3c35..2ddc75b99 100644 --- a/website/README.md +++ b/website/README.md @@ -24,7 +24,7 @@ You should preview all of your changes locally before creating a pull request. T **Launch Site Locally** 1. Navigate into your local `terraform` top-level directory and run `make website`. -1. Open `http://localhost:4567` in your web browser. While the preview is running, you can edit pages and Next.js will automatically rebuild them. +1. Open `http://localhost:3000` in your web browser. While the preview is running, you can edit pages and Next.js will automatically rebuild them. 1. When you're done with the preview, press `ctrl-C` in your terminal to stop the server. ## Deploying Changes