From 3b85d5295c89fd7f0313db4cf3d6b8952adc9654 Mon Sep 17 00:00:00 2001 From: d3vyce Date: Tue, 30 Apr 2024 23:33:30 +0200 Subject: [PATCH] bump: blowfish/hugo version --- .gitea/workflows/1_build_hugo_image.yml | 5 +++-- .gitea/workflows/2_build_blog_image.yml | 2 ++ Dockerfile | 2 +- hugo.Dockerfile | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/1_build_hugo_image.yml b/.gitea/workflows/1_build_hugo_image.yml index fb50a60..9f446f6 100644 --- a/.gitea/workflows/1_build_hugo_image.yml +++ b/.gitea/workflows/1_build_hugo_image.yml @@ -2,8 +2,7 @@ name: Build Hugo Docker Image on: push: - paths: - - "hugo.Dockerfile" + jobs: build docker: @@ -25,6 +24,8 @@ jobs: uses: docker/build-push-action@v4 with: context: . + build-args: + HUGO_VERSION="v0.125.4" file: ./hugo.Dockerfile platforms: linux/amd64 push: true diff --git a/.gitea/workflows/2_build_blog_image.yml b/.gitea/workflows/2_build_blog_image.yml index b50c4fe..353e9e4 100644 --- a/.gitea/workflows/2_build_blog_image.yml +++ b/.gitea/workflows/2_build_blog_image.yml @@ -34,6 +34,8 @@ jobs: uses: docker/build-push-action@v4 with: context: . + build-args: + BLOWFISH_VERSION="v2.66.0" file: ./Dockerfile platforms: linux/amd64 push: true diff --git a/Dockerfile b/Dockerfile index 8e663a9..d9b1ad6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /opt/blog COPY . /opt/blog/ RUN git submodule update --init --recursive && \ - git -C themes/blowfish/ checkout v2.65.0 + git -C themes/blowfish/ checkout ${BLOWFISH_VERSION} RUN hugo # Publish Stage diff --git a/hugo.Dockerfile b/hugo.Dockerfile index 6692e01..2fb0624 100644 --- a/hugo.Dockerfile +++ b/hugo.Dockerfile @@ -7,4 +7,4 @@ ENV GO111MODULE=on RUN apk update && \ apk add --no-cache gcc musl-dev g++ git -RUN go install -tags extended github.com/gohugoio/hugo@v0.124.1 +RUN go install -tags extended github.com/gohugoio/hugo@${HUGO_VERSION}