diff --git a/.gitea/workflows/1_build_hugo_image.yml b/.gitea/workflows/1_build_hugo_image.yml deleted file mode 100644 index d8a46ca..0000000 --- a/.gitea/workflows/1_build_hugo_image.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Build Hugo Docker Image - -on: - push: - paths: - - ".gitea/workflows/1_build_hugo_image.yml" - -jobs: - build docker: - runs-on: linux_amd - steps: - - name: checkout code - uses: actions/checkout@v4 - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Login to Docker registry - uses: docker/login-action@v3 - with: - registry: git.d3vyce.fr - username: ${{ github.actor }} - password: ${{ secrets.GIT_TOKEN }} - - name: Build and push - uses: docker/build-push-action@v6 - with: - context: . - build-args: - HUGO_VERSION=v0.145.0 - file: ./hugo.Dockerfile - platforms: linux/amd64 - push: true - tags: git.d3vyce.fr/d3vyce/hugo:latest diff --git a/.gitea/workflows/2_build_blog_image.yml b/.gitea/workflows/build_blog_image.yml similarity index 95% rename from .gitea/workflows/2_build_blog_image.yml rename to .gitea/workflows/build_blog_image.yml index bb2ae75..6dae685 100644 --- a/.gitea/workflows/2_build_blog_image.yml +++ b/.gitea/workflows/build_blog_image.yml @@ -34,8 +34,6 @@ jobs: uses: docker/build-push-action@v6 with: context: . - build-args: - BLOWFISH_VERSION=v2.84.0 file: ./Dockerfile platforms: linux/amd64 push: true diff --git a/Dockerfile b/Dockerfile index 466cb1e..54137c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build Stage -FROM git.d3vyce.fr/d3vyce/hugo:latest AS build +FROM hugomods/hugo:0.145.0 AS build ARG BLOWFISH_VERSION @@ -7,7 +7,7 @@ WORKDIR /opt/blog COPY . /opt/blog/ RUN git submodule update --init --recursive && \ - git -C themes/blowfish/ checkout ${BLOWFISH_VERSION} + git -C themes/blowfish/ checkout v2.84.0 RUN hugo # Publish Stage diff --git a/hugo.Dockerfile b/hugo.Dockerfile deleted file mode 100644 index 6752fc3..0000000 --- a/hugo.Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM golang:1.24-alpine AS build - -ARG HUGO_VERSION -ARG CGO=1 - -ENV CGO_ENABLED=${CGO} -ENV GOOS=linux -ENV GO111MODULE=on - -RUN apk update && \ - apk add --no-cache gcc musl-dev g++ git -RUN go install -tags extended github.com/gohugoio/hugo@${HUGO_VERSION}