Merge branch 'master' into everything_in_docker

Adam Parkin · Adam Parkin · commit 9274860eca16 · 2018-04-08T10:54:02.000-07:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM koalaman/shellcheck-alpine
+FROM alpine:latest
 
 WORKDIR /build
 
diff --git a/Makefile b/Makefile
@@ -39,7 +39,6 @@ help:
 	@echo '   make s3_upload                      upload the web site via S3         '
 	@echo '   make markdownlint                   run markdownlint on content        '
 	@echo '   make pylint                         run pylint on content              '
-	@echo '   make shellcheck                     run shellcheck on all the scripts  '
 	@echo '   make lint_the_things                run all linters & checks           '
 	@echo '   make dockerbuild                    build docker image                 '
 	@echo '   make dockerrun                      run a shell in built Docker image  '
@@ -92,18 +91,14 @@ publish:
 s3_upload: publish lint_the_things
 	aws s3 sync $(OUTPUTDIR) s3://$(S3_BUCKET) --delete $(S3OPTS)
 
-lint_the_things: markdownlint pylint shellcheck
+lint_the_things: markdownlint pylint
 
 markdownlint: dockerbuild
 	docker run --rm -it -w /build/content $(DOCKER_IMAGE_NAME):latest markdownlint .
 
 pylint: dockerbuild
 	docker run --rm -it -w /build/python $(DOCKER_IMAGE_NAME):latest pylint *.py
 
-shellcheck: dockerbuild
-	echo "Shellcheck disabled until its fixed"
-	#docker run --rm -it -w /build/shell $(DOCKER_IMAGE_NAME):latest shellcheck *.sh
-
 dockerbuild:
 	docker build -t $(DOCKER_IMAGE_NAME):latest .
 
diff --git a/content/setting-up-the-site-in-aws.md b/content/setting-up-the-site-in-aws.md
@@ -1,18 +1,17 @@
 Title: Setting Up A Pelican Site in AWS
-Date: 2018-04-03 07:24
+Date: 2018-04-08 07:24
 tags: pelican,aws,s3,hosting
-Status: draft
 
 So I was going to write a blog post outlining most of the stuff I did in getting this
 site up off the ground, but then a colleague went ahead and did the same and
 wrote up his journey. :)
 
-So, in true CodependentCodr fashion, Imma going to stea...err borrow his content since I was largely the same steps.
+So, in true CodependentCodr fashion, Imma going to stea...err borrow his content since
+mine was largely the same steps (and he's better at AWS than I am). :p
 
-Go here and here for all the deets on getting a static site set up with Pelican in AWS.
-Ben does a great job too of walking through setting up a nice local dev pipeline with Docker
-(mine's not quite the same, but similar, and I'm likely eventually going to do the same as him).
+Go [here](https://ben.gnoinski.ca/how-this-site-came-to-be.html) for all the deets on getting
+a static site set up with Pelican in AWS. Ben does a great job too of walking through setting
+up a nice local dev pipeline with Docker (mine's not quite the same, but similar, and I'm
+likely eventually going to do the same as him).
 
-<http://ben.gnoinski.ca.s3-website.ca-central-1.amazonaws.com/how-this-site-came-to-be.html>
-
-<http://ben.gnoinski.ca.s3-website.ca-central-1.amazonaws.com/uploading-my-new-site-to-s3.html>
+Thanks Ben!

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM koalaman/shellcheck-alpine`
	`1`	`+FROM alpine:latest`
`2`	`2`
`3`	`3`	`WORKDIR /build`
`4`	`4`