Removed Circle configuration and cleaned up build script

.gitignore

@@ -1,3 +1,3 @@
 out
 .DS_Store
-env.ini
+docker/env.ini

Makefile

@@ -3,9 +3,11 @@ all: out/render.png
 clean:
 	rm -rf out
 
+# To build and publish rendered map, collected data, and Github status,
+# create docker/env.ini from template in docker/env.ini-sample.
 status:
 	docker build -t nvkelso/elections-geodata docker
-	docker run --env-file env.ini --rm -v `pwd`:/vol -w /vol nvkelso/elections-geodata
+	docker run --env-file docker/env.ini --rm -v `pwd`:/vol -w /vol nvkelso/elections-geodata
 
 .PHONY: all clean status
 

docker/build-publish.sh

@@ -21,15 +21,21 @@ RENDER_PATH=$S3_BUCKET/commits/$GIT_SHA1/render.png
 aws --region us-east-1 s3 cp --acl public-read out/render.png s3://$RENDER_PATH
 scripts/update-status.py https://s3.amazonaws.com/$RENDER_PATH
 
-# Check if we're on the deploy branch.
+# Deploy if we're on the deploy branch.
 if [ $GIT_BRANCH = 'master' ]; then
 
     # Upload render and data for this branch.
-    aws --region us-east-1 s3 cp --acl public-read --cache-control 'max-age=60 public' out/render.png s3://$S3_BUCKET/branches/$GIT_BRANCH/render.png
-    ogr2ogr out/nation.shp out/nation.gpkg
+    BRANCH_DIR=$S3_BUCKET/branches/$GIT_BRANCH
+    aws --region us-east-1 s3 cp --acl public-read --cache-control 'max-age=60 public' \
+        out/render.png s3://$BRANCH_DIR/render.png
+
     gzip -9 out/nation.gpkg
-    aws --region us-east-1 s3 cp --acl public-read --content-encoding gzip --content-type application/geopackage out/nation.gpkg.gz s3://$S3_BUCKET/branches/$GIT_BRANCH/nation.gpkg
+    aws --region us-east-1 s3 cp --acl public-read --content-encoding gzip --content-type application/geopackage \
+        out/nation.gpkg.gz s3://$BRANCH_DIR/nation.gpkg
+
+    ogr2ogr out/nation.shp out/nation.gpkg
     zip -j out/nation.zip out/nation.shp out/nation.shx out/nation.prj out/nation.dbf
-    aws --region us-east-1 s3 cp --acl public-read --content-type application/zip out/nation.zip s3://$S3_BUCKET/branches/$GIT_BRANCH/nation-shp.zip
+    aws --region us-east-1 s3 cp --acl public-read --content-type application/zip \
+        out/nation.zip s3://$BRANCH_DIR/nation-shp.zip
 
 fi