From 40c58e8d9b2786efdf4be0a4022a15430c50ec3d Mon Sep 17 00:00:00 2001 From: ahmza Date: Sun, 23 Aug 2026 18:15:52 +0000 Subject: [PATCH] harden Hugo build and remove unused CMS --- .dockerignore | 18 +++++++ .gitea/workflows/build-docker-images.yml | 2 - .gitignore | 1 - Dockerfile | 19 +++---- config/_default/languages.en.toml | 4 +- config/_default/module.toml | 2 +- go.mod | 2 +- go.sum | 2 + static/admin/config.yml | 69 ------------------------ static/admin/index.html | 20 ------- 10 files changed, 32 insertions(+), 107 deletions(-) create mode 100644 .dockerignore create mode 100644 go.sum delete mode 100644 static/admin/config.yml delete mode 100644 static/admin/index.html diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..2fd3564 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,18 @@ +# Send only files required by the Hugo build and SWS runtime stages. +* + +!Dockerfile +!go.mod +!go.sum +!sws.toml + +!assets/ +!assets/** +!config/ +!config/** +!content/ +!content/** +!layouts/ +!layouts/** +!static/ +!static/** diff --git a/.gitea/workflows/build-docker-images.yml b/.gitea/workflows/build-docker-images.yml index 4cd3e14..cfe4ed5 100644 --- a/.gitea/workflows/build-docker-images.yml +++ b/.gitea/workflows/build-docker-images.yml @@ -43,8 +43,6 @@ jobs: context: . platforms: linux/arm64, linux/amd64 push: true - build-args: | - BUILDKIT_CONTEXT_KEEP_GIT_DIR=true tags: | ${{ env.REGISTRY }}/${{ gitea.repository_owner }}/blog-ahmza-com:latest ${{ env.REGISTRY }}/${{ gitea.repository_owner }}/blog-ahmza-com:${{ gitea.event.head_commit.id }} diff --git a/.gitignore b/.gitignore index 6c45c39..4ff5143 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,4 @@ styles/ node_modules public/ resources/ -go.sum themes/ diff --git a/Dockerfile b/Dockerfile index 45b00a7..4b64b56 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,20 +3,17 @@ # under QEMU emulation). Hugo output is static HTML — identical across arches — # so there's no reason to run it per target arch. The runtime stage below stays # on TARGETPLATFORM, so multi-arch (amd64 + arm64) runtime images are preserved. -FROM --platform=$BUILDPLATFORM ghcr.io/hugomods/hugo:0.157.0 AS build +FROM --platform=$BUILDPLATFORM ghcr.io/hugomods/hugo:0.165.0 AS build WORKDIR /tmp/hugo -#COPY go.mod ./ -#RUN hugo mod get -# -#COPY archetypes ./archetypes -#COPY assets ./assets -#COPY content ./content -#COPY static ./static -#COPY themes ./themes -#COPY hugo.* ./ +COPY go.mod go.sum ./ +COPY config ./config +RUN hugo mod graph -COPY . . +COPY assets ./assets +COPY content ./content +COPY layouts ./layouts +COPY static ./static RUN hugo --gc --minify FROM ghcr.io/static-web-server/static-web-server:2 diff --git a/config/_default/languages.en.toml b/config/_default/languages.en.toml index 3c0820b..a13900c 100644 --- a/config/_default/languages.en.toml +++ b/config/_default/languages.en.toml @@ -1,5 +1,5 @@ -languageCode = "en" -languageName = "English" +locale = "en" +label = "English" weight = 1 title = "ahmza's ramblings" diff --git a/config/_default/module.toml b/config/_default/module.toml index 520d196..d1544a3 100644 --- a/config/_default/module.toml +++ b/config/_default/module.toml @@ -1,3 +1,3 @@ [[imports]] disable = false -path = "github.com/nunocoracao/blowfish/v2" +path = "github.com/nunocoracao/blowfish/v3" diff --git a/go.mod b/go.mod index 5c24c5e..1270d3b 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module github.com/ahmzaa/blog-ahmza-com go 1.24.3 -require github.com/nunocoracao/blowfish/v2 v2.86.0 // indirect +require github.com/nunocoracao/blowfish/v3 v3.4.0 diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..1f84a47 --- /dev/null +++ b/go.sum @@ -0,0 +1,2 @@ +github.com/nunocoracao/blowfish/v3 v3.4.0 h1:Fv7mS97lagllTGzHA2V1H6+N5fuQd3DuWmOQlFFV4Aw= +github.com/nunocoracao/blowfish/v3 v3.4.0/go.mod h1:8lJwR95VgcyWDhjKvUJMdOQXogrmhYSxkWh4ogSJfCg= diff --git a/static/admin/config.yml b/static/admin/config.yml deleted file mode 100644 index b4f5250..0000000 --- a/static/admin/config.yml +++ /dev/null @@ -1,69 +0,0 @@ -## Commit messages -backend: - name: github - repo: ahmzaa/blog-ahmza-com - branch: main - squash_merges: true - base_url: https://sveltia-cms-auth.hamzaahmed12328.workers.dev - use_graphql: true - commit_messages: - create: Create {{collection}} "{{slug}}" - update: Update {{collection}} "{{slug}}" - delete: Delete {{collection}} "{{slug}}" - uploadMedia: Upload "{{path}}" - deleteMedia: Delete "{{path}}" - openAuthoring: '{{message}}' - -## Publish mode -publish_mode: editorial_workflow # Allowed Values: simple, editorial_workflow - -## Media and Public folders -#Media -media_folder: "assets/uploaded/img" -public_folder: "/uploaded/img" - -## SiteTitle -site_url: https://blog.ahmza.com -display_url: blog.ahmza.com -logo_url: https://blog.ahmza.com/logo.webp - -## Collections -collections: - - name: posts - identifier_field: name - label: posts - label_singular: post - icon: article - description: sites main content, blog posts - folder: "content/posts" - path: "{{slug}}/index" - media_folder: "" - public_folder: "" - create: true - slug: '{{slug}}' - fields: - - {label: "Title", name: "title", widget: "string"} - - {label: "Featured Image", name: "featureimage", widget: "image"} - - {label: "Featured Image Caption", name: "featureimagecaption", widget: "string"} - - {label: "Publish Date", name: "date", widget: "datetime", default: "{{now}}", date_format: "YYYY-MM-DD"} - - {label: "Last Modified", name: "lastmod", widget: "datetime", default: "{{now}}", date_format: "YYYY-MM-DD"} - - {label: "Author", name: "author", widget: "string", default: "ahmza"} - - {label: "Draft", name: "draft", widget: "boolean", default: "false"} - - {label: "Tags", name: "tags", widget: "list"} - - {label: "Description", name: "description", widget: "string"} - - {label: "Body", name: "body", widget: "markdown"} - extension: md - sortable_fields: ['title', 'date', 'lastmod', 'tags'] - view_filters: - - label: "ahmza's posts" - field: author - pattern: 'ahmza' - - label: Drafts - field: draft - pattern: true - view_groups: - - label: Year - field: date - pattern: \d{4} - - label: Drafts - field: draft diff --git a/static/admin/index.html b/static/admin/index.html deleted file mode 100644 index 2cabb3a..0000000 --- a/static/admin/index.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - Content Manager - - - - - - -