noticket - Makefile updates

Makefile

@@ -1,109 +1,32 @@
-# This Makefile was originally taken from https://github.com/alimac/alimac.io/
+WEBSITE=debyl.io
-# Website hostname, used to set:
-# - image and container names
-# - path to web root (in /tmp directory)
-WEB_BUCKET=bdebyl.net
-STATIC_BUCKET=bdebyl.static
-STATIC_DIR=static
 
-HUGO_IMAGE_NAME=bdebyl/hugo
+AWS=aws --profile default
-HUGO_IMAGE_TAG?=latest
-HUGO_IMAGE=$(HUGO_IMAGE_NAME):$(HUGO_IMAGE_TAG)
-
-THUMBR_IMAGE_NAME=bdebyl/thumbr
-THUMBR_IMAGE_TAG?=latest
-THUMBR_IMAGE?=$(THUMBR_IMAGE_NAME):$(THUMBR_IMAGE_TAG)
-
-AWS_IMAGE_NAME=bdebyl/awscli
-AWS_IMAGE_TAG?=latest
-AWS_IMAGE=$(AWS_IMAGE_NAME):$(AWS_IMAGE_TAG)
-
-MDLINT_IMAGE_NAME=peterdavehello/markdownlint
-MDLINT_IMAGE_TAG?=latest
-MDLINT_IMAGE?=$(MDLINT_IMAGE_NAME):$(MDLINT_IMAGE_TAG)
-MDLINT_PATH?=content/
-
-# Container Variables
-RUN_USER=--user $(shell id -u $$USER):$(shell id -g $$USER)
-RUN_VOL=-v $(shell pwd):/src
-AWS_ENV=-e "AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}" -e "AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}" -e "AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION}"
-
-MOUNT_BUCKET?=1
-
-DOCKER_PORT=-p 1313:1313/tcp
-DOCKER_RUN=docker run --rm ${RUN_USER} ${RUN_VOL}
 
 # Look up CloudFront distribution ID based on website alias
-DISTRIBUTION_ID=$(shell docker run --rm ${AWS_ENV} ${AWS_IMAGE} cloudfront list-distributions \
+DISTRIBUTION_ID=$(shell ${AWS} cloudfront list-distributions \
-	--query 'DistributionList.Items[].{id:Id,a:Aliases.Items}[?contains(a,`${WEB_BUCKET}`)].id' \
+	--query 'DistributionList.Items[].{id:Id,a:Aliases.Items}[?contains(a,`${WEBSITE}`)].id' \
 	--output text)
+S3_SYNC=s3 sync --sse "AES256" public/ s3://${WEBSITE}
+CLOUDFRONT_INVALIDATE=cloudfront create-invalidation --distribution-id ${DISTRIBUTION_ID} --paths '/*'
 
-ifdef DRYRUN
+# Default target for make (<=3.80)
-	S3_DRYRUN=--dryrun
+default:
-endif
+	-hugo server
-ifdef DELETE
+.PHONY: default
-	S3_DELETE=--delete
-endif
-S3_CACHE_CONTROL?=86400
-S3_CMD=s3 sync ${S3_DRYRUN} ${S3_DELETE} --metadata-directive REPLACE --cache-control max-age=${S3_CACHE_CONTROL},public --acl "public-read" --sse "AES256"
-S3_CMD_WEB=${S3_CMD} public/ s3://${WEB_BUCKET}
-S3_CMD_STATIC=${S3_CMD} static/ s3://${STATIC_BUCKET}
-CLOUDFRONT_PATHS?='/*'
-CLOUDFRONT_CMD=cloudfront create-invalidation --distribution-id ${DISTRIBUTION_ID} --paths ${CLOUDFRONT_PATHS}
-
-all: build
 
 build:
-	$(DOCKER_RUN) ${HUGO_IMAGE}
+	-hugo build
 .PHONY: build
 
-lint:
-	$(DOCKER_RUN) -v $$PWD:/md:ro ${MDLINT_IMAGE} markdownlint ${MDLINT_PATH}
-.PHONY: lint
-
-static-pull:
-	if [ ! -d "${STATIC_DIR}/static" ]; then aws s3 sync s3://${STATIC_BUCKET} ${STATIC_DIR}/; fi
-.PHONY: static-pull
-
-static-push:
-	aws ${S3_CMD_STATIC}
-.PHONY: static-push
-
-static-images:
-	@${DOCKER_RUN} ${THUMBR_IMAGE} ${STATIC_DIR}/static/img
-.PHONY: static-images
-
-css-push:
-	aws s3 cp --acl "public-read" --sse "AES256" public/dist/style.css s3://${WEB_BUCKET}/dist/style.css
-.PHONY: css-push
-
-run: static-pull
-	-$(DOCKER_RUN) -it ${DOCKER_PORT} ${HUGO_IMAGE} -D server --bind=0.0.0.0
-.PHONY: run
-
-version:
-	$(DOCKER_RUN) ${HUGO_IMAGE} version
-.PHONY: version
-
-new:
-	$(DOCKER_RUN) ${HUGO_IMAGE} new post/"$(shell read -p 'Post Name (i.e. my_post.md): ' pn; echo $$pn)"
-.PHONY: new
-
 clean:
-	@# Clean up existing generated site
+	rm -rfv public/
-	rm -rf public/ resources/
-.PHONY: clean
-
-static-clean:
-	if [ -d "${STATIC_DIR}/static" ]; then rm -rfv static/
-.PHONY: static-clean
 
 deploy: clean build
 	@# Upload files to S3
-	@$(DOCKER_RUN) ${AWS_ENV} ${AWS_IMAGE} ${S3_CMD_WEB}
+	${AWS} ${S3_SYNC}
 .PHONY: deploy
 
 cache:
 	@# Invalidate caches
-	@$(DOCKER_RUN) ${AWS_ENV} ${AWS_IMAGE} ${CLOUDFRONT_CMD}
+	${AWS} ${CLOUDFRONT_INVALIDATE}
 .PHONY: cache