From 5ed3e0c03487b2ec35d3646ffd9a85f65bc48bc8 Mon Sep 17 00:00:00 2001 From: HashiBot <62622282+hashibot-web@users.noreply.github.com> Date: Tue, 11 Oct 2022 11:39:47 -0500 Subject: [PATCH] chore: Update Digital Team Files (#14945) * Update generated scripts (website-build.sh) * Update generated scripts (should-build.sh) * Update generated scripts (website-start.sh) * Update generated website Makefile --- website/Makefile | 24 ++++++++++++++++++------ website/scripts/should-build.sh | 9 +++++++-- website/scripts/website-build.sh | 9 +++++++-- website/scripts/website-start.sh | 9 +++++++-- 4 files changed, 39 insertions(+), 12 deletions(-) diff --git a/website/Makefile b/website/Makefile index 5f2090a79..4703a43c9 100644 --- a/website/Makefile +++ b/website/Makefile @@ -1,5 +1,17 @@ +###################################################### +# NOTE: This file is managed by the Digital Team's # +# Terraform configuration @ hashicorp/mktg-terraform # +###################################################### + .DEFAULT_GOAL := website +# Set the preview mode for the website shell to "developer" or "io" +PREVIEW_MODE ?= developer +REPO ?= consul + +# Enable setting alternate docker tool, e.g. 'make DOCKER_CMD=podman' +DOCKER_CMD ?= docker + PWD=$$(pwd) DOCKER_IMAGE="hashicorp/dev-portal" DOCKER_IMAGE_LOCAL="dev-portal-local" @@ -13,27 +25,27 @@ DOCKER_RUN_FLAGS=-it \ --volume "$(PWD)/redirects.js:/app/redirects.js" \ --volume "next-dir:/app/website-preview/.next" \ --volume "$(PWD)/.env:/app/.env" \ - -e "REPO=consul" \ - -e "PREVIEW_MODE=io" + -e "REPO=$(REPO)" \ + -e "PREVIEW_MODE=$(PREVIEW_MODE)" # Default: run this if working on the website locally to run in watch mode. .PHONY: website website: @echo "==> Downloading latest Docker image..." - @docker pull $(DOCKER_IMAGE) + @$(DOCKER_CMD) pull $(DOCKER_IMAGE) @echo "==> Starting website..." - @docker run $(DOCKER_RUN_FLAGS) $(DOCKER_IMAGE) + @$(DOCKER_CMD) run $(DOCKER_RUN_FLAGS) $(DOCKER_IMAGE) # Use this if you have run `website/build-local` to use the locally built image. .PHONY: website/local website/local: @echo "==> Starting website from local image..." - @docker run $(DOCKER_RUN_FLAGS) $(DOCKER_IMAGE_LOCAL) + @$(DOCKER_CMD) run $(DOCKER_RUN_FLAGS) $(DOCKER_IMAGE_LOCAL) # Run this to generate a new local Docker image. .PHONY: website/build-local website/build-local: @echo "==> Building local Docker image" - @docker build https://github.com/hashicorp/dev-portal.git\#main \ + @$(DOCKER_CMD) build https://github.com/hashicorp/dev-portal.git\#main \ -t $(DOCKER_IMAGE_LOCAL) diff --git a/website/scripts/should-build.sh b/website/scripts/should-build.sh index 1d0cb6fd9..9760f4774 100644 --- a/website/scripts/should-build.sh +++ b/website/scripts/should-build.sh @@ -1,4 +1,9 @@ -#!/bin/bash +#!/usr/bin/env bash + +###################################################### +# NOTE: This file is managed by the Digital Team's # +# Terraform configuration @ hashicorp/mktg-terraform # +###################################################### # This is run during the website build step to determine if we should skip the build or not. # More information: https://vercel.com/docs/platform/projects#ignored-build-step @@ -10,4 +15,4 @@ if [[ "$VERCEL_GIT_COMMIT_REF" == "stable-website" ]] ; then else # Check for differences in the website directory git diff --quiet HEAD^ HEAD ./ -fi +fi \ No newline at end of file diff --git a/website/scripts/website-build.sh b/website/scripts/website-build.sh index 3e14a5bf7..e2c7b7eab 100755 --- a/website/scripts/website-build.sh +++ b/website/scripts/website-build.sh @@ -1,3 +1,8 @@ +###################################################### +# NOTE: This file is managed by the Digital Team's # +# Terraform configuration @ hashicorp/mktg-terraform # +###################################################### + # Repo which we are cloning and executing npm run build:deploy-preview within REPO_TO_CLONE=dev-portal # Set the subdirectory name for the base project @@ -7,7 +12,7 @@ CLONE_DIR=website-preview # The product for which we are building the deploy preview PRODUCT=consul # Preview mode, controls the UI rendered (either the product site or developer). Can be `io` or `developer` -PREVIEW_MODE=io +PREVIEW_MODE=developer from_cache=false @@ -30,4 +35,4 @@ fi cd "$PREVIEW_DIR" # Run the build:deploy-preview start script -PREVIEW_MODE=$PREVIEW_MODE REPO=$PRODUCT HASHI_ENV=project-preview npm run build:deploy-preview +PREVIEW_MODE=$PREVIEW_MODE REPO=$PRODUCT HASHI_ENV=project-preview npm run build:deploy-preview \ No newline at end of file diff --git a/website/scripts/website-start.sh b/website/scripts/website-start.sh index e9f1b05d3..794662ccf 100755 --- a/website/scripts/website-start.sh +++ b/website/scripts/website-start.sh @@ -1,3 +1,8 @@ +###################################################### +# NOTE: This file is managed by the Digital Team's # +# Terraform configuration @ hashicorp/mktg-terraform # +###################################################### + # Repo which we are cloning and executing npm run build:deploy-preview within REPO_TO_CLONE=dev-portal # Set the subdirectory name for the dev-portal app @@ -5,7 +10,7 @@ PREVIEW_DIR=website-preview # The product for which we are building the deploy preview PRODUCT=consul # Preview mode, controls the UI rendered (either the product site or developer). Can be `io` or `developer` -PREVIEW_MODE=io +PREVIEW_MODE=developer should_pull=true @@ -24,4 +29,4 @@ if [ "$should_pull" = true ]; then fi # Run the dev-portal content-repo start script -REPO=$PRODUCT PREVIEW_MODE=$PREVIEW_MODE npm run start:local-preview +REPO=$PRODUCT PREVIEW_MODE=$PREVIEW_MODE npm run start:local-preview \ No newline at end of file