.drone.yml

@@ -1,4 +1,3 @@
----
 kind: pipeline
 type: docker
 name: linux-amd64
@@ -34,7 +33,9 @@ steps:
       username:
         from_secret: docker_username
       tags:
-        - latest-amd64
+        - ${DRONE_TAG}-linux-amd64
+        - ${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR}-linux-amd64
+        - ${DRONE_SEMVER_MAJOR}-linux-amd64
     when:
       event:
         - tag
@@ -75,29 +76,75 @@ steps:
       username:
         from_secret: docker_username
       tags:
-        - latest-arm64
+        - ${DRONE_TAG}-linux-arm64
+        - ${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR}-linux-arm64
+        - ${DRONE_SEMVER_MAJOR}-linux-arm64
     when:
       event:
         - tag
 
+# no build server available (at the moment) for this arch
+
+# ---
+# kind: pipeline
+# type: docker
+# name: linux-arm
+
+# platform:
+#   arch: arm
+#   os: linux
+
+# steps:
+#   - name: build
+#     image: plugins/docker:linux-arm
+#     settings:
+#       dockerfile: Dockerfile
+#       dry_run: true
+#       repo: docker.asperti.com/paspo/hugo
+#     when:
+#       event:
+#         - push
+
+#   - name: build_and_publish
+#     image: plugins/docker:linux-arm
+#     settings:
+#       dockerfile: Dockerfile
+#       force_tag: true
+#       password:
+#         from_secret: docker_password
+#       registry: docker.asperti.com
+#       repo: docker.asperti.com/paspo/hugo
+#       username:
+#         from_secret: docker_username
+#       tags:
+#         - ${DRONE_TAG}-linux-arm
+#         - ${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR}-linux-arm
+#         - ${DRONE_SEMVER_MAJOR}-linux-arm
+#     when:
+#       event:
+#         - tag
+
 ---
 kind: pipeline
 type: docker
 name: manifest
 
 steps:
-  - name: manifest
+- name: manifest
-    image: plugins/manifest
+  image: plugins/manifest
-    settings:
+  settings:
-      force_tag: true
+    force_tag: true
-      ignore_missing: true
+    ignore_missing: true
-      spec: manifest.tmpl
+    spec: manifest.tmpl
-      username:
+    username:
-        from_secret: docker_username
+      from_secret: docker_username
-      password:
+    password:
-        from_secret: docker_password
+      from_secret: docker_password
-      tags:
+    tags:
-        - latest
+      - latest
+      - ${DRONE_TAG}
+      - ${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR}
+      - ${DRONE_SEMVER_MAJOR}
 
 trigger:
   event:
@@ -106,3 +153,4 @@ trigger:
 depends_on:
   - linux-amd64
   - linux-arm64
+# - linux-arm

Dockerfile

@@ -1,23 +1,11 @@
-##### this stage will download latest deb package
+FROM debian:11-slim
-
-FROM alpine:latest as prep
 
+ARG HUGO_VERSION=0.111.3
 ARG HUGO_ARCH=amd64
 
-RUN \
+ADD "https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-${HUGO_ARCH}.deb" /tmp/hugo.deb
-    apk -U add lastversion && \
-    wget $(lastversion --filter "hugo_extended_.*\-${HUGO_ARCH}\.deb$" --pre gohugoio/hugo  --format assets ) -O /tmp/hugo.deb
-
-
-##### final image
-
-FROM debian:12-slim
-
-COPY --from=prep /tmp/hugo.deb /tmp/hugo.deb
 
 RUN \
-    apt update && \
-    DEBIAN_FRONTEND=noninteractive apt -y upgrade && \
     apt install -y /tmp/hugo.deb && rm /tmp/hugo.deb
 
 ENTRYPOINT [ "/usr/local/bin/hugo" ]

README.md

@@ -4,14 +4,6 @@
 
 Simple container for hugo development
 
-## available tags
-
-| tag          | description                         |
-| ------------ | ----------------------------------- |
-| latest       | multi-arch manifest                 |
-| latest-amd64 | latest build for amd64 architecture |
-| latest-arm64 | latest build for arm64 architecture |
-
 ## build
 
 ```bash
@@ -52,3 +44,4 @@ steps:
 ## TODO
 
 - Auto build and update based on hugo version
+

manifest.tmpl

@@ -1,13 +1,31 @@
-image: docker.asperti.com/paspo/hugo:latest
+image: docker.asperti.com/paspo/hugo:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
+{{#if build.tags}}
+tags:
+{{#each build.tags}}
+  - {{this}}
+{{/each}}
+{{/if}}
 manifests:
   -
-    image: docker.asperti.com/paspo/hugo:latest-amd64
+    image: docker.asperti.com/paspo/hugo:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
     platform:
       architecture: amd64
       os: linux
   -
-    image: docker.asperti.com/paspo/hugo:latest-arm64
+    image: docker.asperti.com/paspo/hugo:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
     platform:
       variant: v8
       architecture: arm64
       os: linux
+  -
+    image: docker.asperti.com/paspo/hugo:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
+    platform:
+      variant: v7
+      architecture: arm
+      os: linux
+  -
+    image: docker.asperti.com/paspo/hugo:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
+    platform:
+      variant: v6
+      architecture: arm
+      os: linux