jake/jarv.is
jake/jarv.is
1
Fork 0
mirror of https://github.com/jakejarvis/jarv.is.git synced 2025-04-27 13:56:22 -04:00
Code Issues

try to speed up builds

Browse Source
This commit is contained in:
Jake Jarvis 2019-11-11 10:49:11 -05:00
parent f2fb8e812c
commit 6f62c4dff5
Signed by: jake
GPG Key ID: 2B0C9CF251E69A39
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -15,7 +15,7 @@ I keep an ongoing list of [blog post ideas](https://github.com/jakejarvis/jarv.i
This site runs a [custom version](https://github.com/jakejarvis/hugo-custom) of [Hugo Extended](https://github.com/gohugoio/hugo) with a few (very opinionated) changes. To ensure consistency, the [`Dockerfile`](Dockerfile) in this repository will pull my Hugo [fork](https://github.com/jakejarvis/hugo-custom) (forked from `v0.53-DEV`, [gohugo/hugo@`a28865c`](https://github.com/gohugoio/hugo/tree/a28865cfc3e296cf0ddd0bd6c1368fcdb2154d0f) and pre-built on [Docker Hub](https://hub.docker.com/r/jakejarvis/hugo-custom) and [GitHub Package Registry](https://github.com/jakejarvis/hugo-custom/packages)) and run a live testing server. This site runs a [custom version](https://github.com/jakejarvis/hugo-custom) of [Hugo Extended](https://github.com/gohugoio/hugo) with a few (very opinionated) changes. To ensure consistency, the [`Dockerfile`](Dockerfile) in this repository will pull my Hugo [fork](https://github.com/jakejarvis/hugo-custom) (forked from `v0.53-DEV`, [gohugo/hugo@`a28865c`](https://github.com/gohugoio/hugo/tree/a28865cfc3e296cf0ddd0bd6c1368fcdb2154d0f) and pre-built on [Docker Hub](https://hub.docker.com/r/jakejarvis/hugo-custom) and [GitHub Package Registry](https://github.com/jakejarvis/hugo-custom/packages)) and run a live testing server.
Run these commands on the root of this repository: Run [`./scripts/docker-server.sh`](scripts/docker-server.sh) from the root of this repository, or execute these Docker commands:
```bash ```bash
docker build -t jarv.is:develop -f Dockerfile . docker build -t jarv.is:develop -f Dockerfile .

6
netlify.toml
View File

@ -1,6 +1,6 @@
# netlify.sh downloads my custom Hugo fork and builds the site independently. # netlify.sh downloads my custom Hugo fork and builds the site independently.
[build] [build]
command = "./scripts/netlify.sh" command = "./scripts/netlify-build.sh"
publish = "public" publish = "public"
@ -18,11 +18,11 @@
[[redirects]] [[redirects]]
from = "/feed" from = "/feed"
to = "/index.xml" to = "/index.xml"
status = 200 status = 301
[[redirects]] [[redirects]]
from = "/rss" from = "/rss"
to = "/index.xml" to = "/index.xml"
status = 200 status = 301
# Moved Y2K site to its own subdomain: # Moved Y2K site to its own subdomain:
[[redirects]] [[redirects]]

2
scripts/docker-build.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Make sure you run this script from the root of the site repository... # Make sure you run this script from the root of the site repository.
echo "Pull latest Docker image..." echo "Pull latest Docker image..."
docker pull jakejarvis/hugo-custom:latest docker pull jakejarvis/hugo-custom:latest

2
scripts/docker-server.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Make sure you run this script from the root of the site repository... # Make sure you run this script from the root of the site repository.
echo "Pull latest base image..." echo "Pull latest base image..."
docker pull jakejarvis/hugo-custom:latest docker pull jakejarvis/hugo-custom:latest

6
scripts/netlify.sh → scripts/netlify-build.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# only designed to run on Netlify's build image: # only designed to run on Netlify's build image
# https://github.com/netlify/build-image # https://github.com/netlify/build-image
set -euo pipefail set -euo pipefail
@ -30,7 +30,7 @@ curl -sS -L https://github.com/imagemin/optipng-bin/raw/master/vendor/linux/x64/
chmod +x $BINDIR/optipng chmod +x $BINDIR/optipng
# make sure everything's OK # make sure everything's OK
echo "Is Hugo ready..?" echo "Is Hugo ready?"
$BINDIR/hugo-extended version $BINDIR/hugo-extended version
# build Hugo site # build Hugo site
@ -42,7 +42,7 @@ echo "Optimizing JPEGs..."
find ./public -iname "*.jp*" -print0 | xargs -0 $BINDIR/jpegoptim --max=80 --strip-all --quiet find ./public -iname "*.jp*" -print0 | xargs -0 $BINDIR/jpegoptim --max=80 --strip-all --quiet
echo "Optimizing PNGs..." echo "Optimizing PNGs..."
find ./public -iname "*.png" -print0 | xargs -0 $BINDIR/pngquant --quality=50-70 --speed 3 --ext=.png --force find ./public -iname "*.png" -print0 | xargs -0 $BINDIR/pngquant --quality=50-70 --speed 3 --ext=.png --force
find ./public -iname "*.png" -print0 | xargs -0 $BINDIR/optipng -o3 -force -strip all -quiet -- find ./public -iname "*.png" -print0 | xargs -0 $BINDIR/optipng -o1 -force -strip all -quiet --
# remove binaries (kinda unsafe, but doesn't really matter b/c it's docker) # remove binaries (kinda unsafe, but doesn't really matter b/c it's docker)
echo "Cleaning up binaries..." echo "Cleaning up binaries..."