1
mirror of https://github.com/jakejarvis/hugo-docker.git synced 2025-06-30 20:56:38 -04:00

Compare commits

..

21 Commits

Author SHA1 Message Date
4a98dad700 Hugo v0.111.0 (and Alpine v3.17) 2023-03-02 10:43:40 -05:00
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
0a8ca90615 Hugo v0.109.0 2022-12-23 09:59:58 -05:00
8b514c58d7 Hugo v0.108.0 2022-12-06 13:35:43 -05:00
20f98c58b7 Hugo v0.107.0 2022-11-24 15:31:29 -05:00
a10483b36a Hugo v0.106.0 2022-11-17 13:58:35 -05:00
e5a6870534 Hugo v0.105.0 2022-10-28 09:15:18 -04:00
62b12c0d22 Hugo v0.104.3 2022-10-04 12:07:52 -04:00
df27582975 Hugo v0.104.2 2022-09-29 10:58:16 -04:00
6cc3f39751 Hugo v0.104.1 2022-09-26 20:11:22 -04:00
8540c876dd Hugo v0.104.0 2022-09-23 11:32:05 -04:00
e806604521 Hugo v0.103.1 2022-09-18 14:05:41 -04:00
7fc2ac2b8e Hugo v0.103.0 2022-09-15 15:15:44 -04:00
56a30dab8f build with go 1.19 2022-09-06 14:20:06 -04:00
f49e3b1dcd Hugo v0.102.3 2022-09-01 08:06:03 -04:00
2de4b89509 Hugo v0.102.2 2022-08-31 16:15:55 -04:00
10103bce3b Hugo v0.102.1 2022-08-29 10:50:24 -04:00
fcb292357c Hugo v0.102.0 2022-08-28 16:24:46 -04:00
61fa24ed38 switch from mage to go build so go and alpine can be bumped 2022-07-29 13:44:08 -04:00
2 changed files with 19 additions and 16 deletions

View File

@ -14,7 +14,7 @@ jobs:
if: "!contains(github.event.head_commit.message, '[skip ci]')"
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Prepare tags
id: tag
@ -34,16 +34,16 @@ jobs:
echo ::set-output name=tags::${TAGS}
- name: Set up QEMU
uses: docker/setup-qemu-action@master
uses: docker/setup-qemu-action@v2
with:
platforms: all
platforms: linux/amd64,linux/arm64
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@master
uses: docker/setup-buildx-action@v2
- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
@ -52,14 +52,14 @@ jobs:
- name: Login to DockerHub
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v2
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
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
@ -67,7 +67,7 @@ jobs:
- name: Build and push
id: build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
builder: ${{ steps.buildx.outputs.name }}
context: ./

View File

@ -1,11 +1,11 @@
# the following version can be overridden at image build time with --build-arg
ARG HUGO_VERSION=0.101.0
ARG HUGO_VERSION=0.111.0
# 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.18
ARG ALPINE_VERSION=3.15
ARG GO_VERSION=1.19
ARG ALPINE_VERSION=3.17
# ---
@ -28,8 +28,7 @@ RUN apk add --update --no-cache \
gcc \
g++ \
musl-dev \
git && \
go install github.com/magefile/mage@latest
git
# clone source from Git repo:
RUN git clone \
@ -38,7 +37,9 @@ RUN git clone \
--depth 1 \
https://github.com/gohugoio/hugo.git ./
RUN mage -v hugo && mage install
# https://github.com/gohugoio/hugo/commit/241481931f5f5f2803cd4be519936b26d8648dfd
RUN go build -v -ldflags "-X github.com/gohugoio/hugo/common/hugo.vendorInfo=docker" -tags "$HUGO_BUILD_TAGS" && \
mv ./hugo /go/bin/hugo
# fix potential stack size problems on Alpine
# https://github.com/microsoft/vscode-dev-containers/blob/fb63f7e016877e13535d4116b458d8f28012e87f/containers/hugo/.devcontainer/Dockerfile#L19
@ -52,9 +53,9 @@ FROM alpine:${ALPINE_VERSION}
# renew global args from above & pin any dependency versions
ARG HUGO_VERSION
# https://github.com/jgm/pandoc/releases
ARG PANDOC_VERSION=2.17.1.1
ARG PANDOC_VERSION=2.19.2
# https://github.com/sass/dart-sass-embedded/releases
ARG DART_SASS_VERSION=1.49.9
ARG DART_SASS_VERSION=1.58.3
LABEL version="${HUGO_VERSION}"
LABEL repository="https://github.com/jakejarvis/hugo-docker"
@ -121,6 +122,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 && \