1
mirror of https://github.com/jakejarvis/hugo-docker.git synced 2025-04-28 12:10:27 -04:00

Compare commits

..

55 Commits

Author SHA1 Message Date
renovate[bot]
40ca2c3269 Update dependency jgm/pandoc to v3.1.13 2024-04-07 20:24:51 +00:00
renovate[bot]
9733fc0fa6 Update dependency gohugoio/hugo to v0.124.1 2024-03-20 20:32:33 +00:00
renovate[bot]
f4114734b1 Update dependency gohugoio/hugo to v0.124.0 2024-03-16 18:07:16 +00:00
renovate[bot]
fee04015be Update dependency gohugoio/hugo to v0.123.8 2024-03-07 18:18:06 +00:00
renovate[bot]
f824746b8c Update dependency gohugoio/hugo to v0.123.7 2024-03-01 22:26:12 +00:00
renovate[bot]
f9610724d5 Update dependency gohugoio/hugo to v0.123.6 2024-02-28 22:52:20 +00:00
renovate[bot]
fdd2072620 Update dependency gohugoio/hugo to v0.123.4 2024-02-26 22:28:22 +00:00
renovate[bot]
165a3ca3f7 Update dependency gohugoio/hugo to v0.123.3 2024-02-23 22:55:03 +00:00
renovate[bot]
a2b583f385 Update dependency gohugoio/hugo to v0.123.2 2024-02-22 23:03:12 +00:00
renovate[bot]
33c0ae7566 Update dependency gohugoio/hugo to v0.123.1 2024-02-21 12:13:18 +00:00
renovate[bot]
061c644f39 Update dependency gohugoio/hugo to v0.123.0 2024-02-20 00:28:33 +00:00
renovate[bot]
748017bd04 Update golang Docker tag to v1.22 2024-02-16 00:26:18 +00:00
renovate[bot]
9474a6a64d Update dependency jgm/pandoc to v3.1.12 2024-02-15 22:51:44 +00:00
renovate[bot]
4d5ec5f93f Update peter-evans/dockerhub-description action to v4 2024-01-25 18:12:28 +00:00
renovate[bot]
49de69b30e Update actions/cache action to v4 2024-01-17 19:11:51 +00:00
renovate[bot]
1d30ce8bcb Update dependency jgm/pandoc to v3.1.11 2023-12-16 10:19:55 +00:00
renovate[bot]
b2ab6f0041 Update dependency jgm/pandoc to v3.1.10 2023-12-13 07:17:49 +00:00
renovate[bot]
3758f9cad1 Update dependency jgm/pandoc to v3.1.9 2023-10-28 03:19:15 +00:00
renovate[bot]
7f24c16703 Update actions/checkout digest to b4ffde6 2023-10-19 15:01:46 +00:00
renovate[bot]
c8d6cbb13a Update actions/checkout digest to 8ade135 2023-09-22 23:00:54 +00:00
renovate[bot]
16b4f6cdd4 Update docker/setup-qemu-action action to v3 2023-09-12 18:26:44 +00:00
renovate[bot]
06258ba98b Update docker/setup-buildx-action action to v3 2023-09-12 16:00:43 +00:00
renovate[bot]
846307e4c8 Update docker/login-action action to v3 2023-09-12 13:38:05 +00:00
renovate[bot]
974cf9f787 Update docker/build-push-action action to v5 2023-09-12 11:01:01 +00:00
renovate[bot]
5169e3ddfa Update dependency jgm/pandoc to v3.1.8 2023-09-09 21:02:29 +00:00
renovate[bot]
65507b8300 Update actions/checkout action to v4 2023-09-04 15:32:54 +00:00
renovate[bot]
4a14b72e5b Update golang Docker tag to v1.21 2023-09-01 11:36:20 +00:00
renovate[bot]
8305e01188 Update dependency jgm/pandoc to v3.1.7 2023-09-01 00:24:10 +00:00
renovate[bot]
81a93ea44d Update dependency jgm/pandoc to v3.1.6 2023-07-21 19:49:13 +00:00
renovate[bot]
d4dab75ac4 Update dependency jgm/pandoc to v3.1.5 2023-07-07 23:18:29 +00:00
renovate[bot]
c8c26d1fb7 Update dependency jgm/pandoc to v3.1.4 2023-06-25 03:55:13 +00:00
renovate[bot]
ff4c4d46af Update dependency jgm/pandoc to v3.1.3 2023-06-07 09:36:50 +00:00
e2ba706deb
Hugo v0.113.0 2023-06-06 11:15:42 -04:00
59a94508dc
Hugo v0.112.7 2023-06-06 11:15:22 -04:00
421a334f8c
Hugo v0.112.6 2023-06-06 11:15:15 -04:00
21d629e15c
Hugo v0.112.5 2023-06-06 11:14:48 -04:00
391c858bed
Hugo v0.112.4 2023-06-06 11:13:23 -04:00
ba3a3969b7
Update renovate.json 2023-05-25 18:27:56 -04:00
af6f3b8139
Hugo v0.112.3 2023-05-25 16:36:13 -04:00
669722c47a
Hugo v0.112.2 2023-05-25 12:12:03 -04:00
e98baa7dc4
Hugo v0.112.1 2023-05-25 10:55:48 -04:00
755a524c55
Hugo v0.112.0 2023-05-25 09:47:31 -04:00
renovate[bot]
18e51db24a Update alpine Docker tag to v3.18 2023-05-10 05:03:35 +00:00
renovate[bot]
ebe3e97c81 Update dependency sass/dart-sass-embedded to v1.62.1 2023-04-26 07:49:31 +00:00
renovate[bot]
22e644d81d Update dependency sass/dart-sass-embedded to v1.62.0 2023-04-12 06:17:40 +00:00
renovate[bot]
4d1191ce2b Update dependency sass/dart-sass-embedded to v1.60.0 2023-03-24 02:13:04 +00:00
9b9a34e059
automatically build & push on new Hugo releases 2023-03-15 12:31:58 -04:00
renovate[bot]
3d5a32a41a
Configure Renovate (#5)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jake Jarvis <jake@jarv.is>
2023-03-15 09:59:24 -04:00
bdfadabde1
Hugo v0.111.3 2023-03-12 09:02:25 -04:00
ad2b89ae8e
Hugo v0.111.2 2023-03-07 08:13:19 -05:00
ad10482235
Hugo v0.111.1 2023-03-02 10:44:11 -05:00
4a98dad700
Hugo v0.111.0 (and Alpine v3.17) 2023-03-02 10:43:40 -05:00
Greg Baker
e91bc2ed98 This commit fixes a failure scenario caused when the UID of the user within the hugo-extended container does not match the UID or GID of the respective user and group ownership assigned to the files and directories in the volume mounted to /src.
The failure occurs when a git operation triggers recently added safe directory checks to alert the user when there is a UID or GID mismatch.  Because the ENTRYPOINT of the hugo-extended container is a call to `hugo`, there is no ability for the end user of the container to tell git to trust the /src directory before hugo is started.

It is possible to override the UID and GID when using the container, but this causes permission errors and does not seem like a user-friendly path forward.

After this change, the hugo-extended container will contain a global git configuration to trust the /src directory.  This may have security implications that have not been considered, but since only the project directory is mounted to /src, this approach seems to respect the intent of git safe directory checks.
2023-03-02 10:36:36 -05:00
048f5d17f2
Hugo v0.110.0 2023-01-17 10:44:12 -05:00
5c457e33fe
bump GH actions 2023-01-17 10:44:09 -05:00
4 changed files with 92 additions and 52 deletions

View File

@ -4,79 +4,89 @@ on:
push:
branches:
- master
tags:
- 'v*'
pull_request:
branches:
- master
merge_group:
workflow_dispatch:
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
env:
HUB_IMAGE: jakejarvis/hugo-extended
GHCR_IMAGE: ghcr.io/jakejarvis/hugo-extended
jobs:
docker:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[skip ci]')"
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Prepare tags
id: tag
env:
HUB_IMAGE: jakejarvis/hugo-extended
GHCR_IMAGE: ghcr.io/jakejarvis/hugo-extended
run: |
TAGS="${HUB_IMAGE}:latest,${GHCR_IMAGE}:latest"
# If triggered by a new tag, add a version tag to the image
if [[ $GITHUB_REF == refs/tags/* ]]; then
VERSION=${GITHUB_REF#refs/tags/v}
TAGS="$TAGS,${HUB_IMAGE}:${VERSION},${GHCR_IMAGE}:${VERSION}"
fi
# Set output parameters
echo ::set-output name=tags::${TAGS}
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
with:
fetch-depth: 0
- name: Set up QEMU
uses: docker/setup-qemu-action@master
with:
platforms: all
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@master
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
if: ${{ github.ref == 'refs/heads/master' }}
uses: docker/login-action@v3
with:
username: jakejarvis
password: ${{ secrets.DOCKER_HUB_TOKEN }}
- name: Login to GitHub Container Registry
if: ${{ github.ref == 'refs/heads/master' }}
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GHCR_PAT }}
- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- name: Login to DockerHub
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
with:
username: jakejarvis
password: ${{ secrets.DOCKER_HUB_TOKEN }}
- name: Login to GitHub Container Registry
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GHCR_PAT }}
- name: Parse Hugo version
id: parse_version
run: |
HUGO_VERSION="$(grep -oP '(?<=^ARG HUGO_VERSION=).+$' Dockerfile)"
echo "HUGO_VERSION=$HUGO_VERSION" >> $GITHUB_OUTPUT
- name: Build and push
id: build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
builder: ${{ steps.buildx.outputs.name }}
context: ./
context: .
file: ./Dockerfile
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.tag.outputs.tags }}
push: ${{ github.ref == 'refs/heads/master' }}
tags: "${{ env.HUB_IMAGE }}:latest,${{ env.GHCR_IMAGE }}:latest,${{ env.HUB_IMAGE }}:${{ steps.parse_version.outputs.HUGO_VERSION }},${{ env.GHCR_IMAGE }}:${{ steps.parse_version.outputs.HUGO_VERSION }}"
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
- name: Image digest
run: echo ${{ steps.build.outputs.digest }}
- name: Update hub description
uses: peter-evans/dockerhub-description@v4
if: ${{ github.ref == 'refs/heads/master' }}
with:
username: jakejarvis
password: ${{ secrets.DOCKER_HUB_TOKEN }}
repository: ${{ env.HUB_IMAGE }}
short-description: "✏️ Hugo Extended for x64 and ARM64 with PostCSS, Babel, Pandoc, and more baked in."
readme-filepath: ./README.md
enable-url-completion: true

View File

@ -1,15 +1,14 @@
# the following version can be overridden at image build time with --build-arg
ARG HUGO_VERSION=0.109.0
# renovate: datasource=github-releases depName=gohugoio/hugo
ARG HUGO_VERSION=0.124.1
# remove/comment the following line completely to compile vanilla Hugo:
ARG HUGO_BUILD_TAGS=extended
# Hugo >= v0.81.0 requires Go 1.16+ to build
ARG GO_VERSION=1.19
ARG ALPINE_VERSION=3.16
# ---
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS build
# Hugo >= v0.81.0 requires Go 1.16+ to build
FROM golang:1.22-alpine3.18 AS build
# renew global args from above
# https://docs.docker.com/engine/reference/builder/#scope
@ -48,14 +47,16 @@ RUN go install github.com/yaegashi/muslstack@latest && \
# ---
FROM alpine:${ALPINE_VERSION}
FROM alpine:3.18
# renew global args from above & pin any dependency versions
ARG HUGO_VERSION
# https://github.com/jgm/pandoc/releases
ARG PANDOC_VERSION=2.19.2
# renovate: datasource=github-releases depName=jgm/pandoc
ARG PANDOC_VERSION=3.1.13
# https://github.com/sass/dart-sass-embedded/releases
ARG DART_SASS_VERSION=1.57.1
# renovate: datasource=github-releases depName=sass/dart-sass-embedded
ARG DART_SASS_VERSION=1.62.1
LABEL version="${HUGO_VERSION}"
LABEL repository="https://github.com/jakejarvis/hugo-docker"
@ -122,6 +123,8 @@ RUN set -euo pipefail && \
fi && \
# clean up some junk
rm -rf /tmp/* /var/tmp/* /var/cache/apk/* && \
# tell git to trust /src
git config --global --add safe.directory /src && \
# make super duper sure that everything went OK, exit otherwise
hugo env && \
go version && \

View File

27
renovate.json Normal file
View File

@ -0,0 +1,27 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base"
],
"automerge": true,
"platformAutomerge": true,
"regexManagers": [
{
"fileMatch": [
"^Dockerfile$"
],
"matchStrings": [
"# renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?( registryUrl=(?<registryUrl>.*?))?\\s.*?_VERSION=(?<currentValue>.*)\\s"
],
"versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
}
],
"packageRules": [
{
"matchFiles": [
"^Dockerfile$"
],
"extractVersion": "^v(?<version>.*)$"
}
]
}