.gitea/workflows/container.yaml

@@ -1,12 +0,0 @@
-name: Build Multiarch Container Image
-on: [push]
-jobs:
-  call-reusable-workflow:
-    uses: container/multiarch-build-workflow/.gitea/workflows/build.yaml@main
-    with:
-      repository: ${{ gitea.repository }}
-      ref_name: ${{ gitea.ref_name }}
-      sha: ${{ gitea.sha }}
-      registry_url: ${{ secrets.REGISTRY_URL }}
-      registry_user: ${{ secrets.REGISTRY_USER }}
-      registry_pw: ${{ secrets.REGISTRY_PW }}

.woodpecker.yml

@@ -0,0 +1,11 @@
+pipeline:
+  publish-docker-image:
+    image: plugins/kaniko
+    settings:
+      repo: docker.io/thallian/molly-brown
+      tags: latest,${CI_COMMIT_SHA:0:8},${CI_COMMIT_TAG=pre}
+      dockerfile: Dockerfile
+      username:
+        from_secret: DOCKER_USER
+      password:
+        from_secret: DOCKER_PW

Dockerfile

@@ -1,11 +1,11 @@
-FROM docker.io/golang:1.21-alpine3.19 AS builder
+FROM docker.io/golang:1.17.11-alpine3.16 AS builder
 
 ENV GO111MODULE=on
 
-ENV VERSION=2068c3b02abf8f6a9160d1891d16a5237ab77a1b
-RUN go install tildegit.org/solderpunk/molly-brown@$VERSION
+ENV VERSION=48f9a206c03c0470e1c132b9667c6daa3583dada
+RUN go get tildegit.org/solderpunk/molly-brown@$VERSION
 
-FROM docker.io/thallian/confd-env:3.19-3.1.6.2
+FROM docker.io/thallian/confd-env:3.17
 
 RUN addgroup -g 2222 molly-brown
 RUN adduser -h /home/molly-brown -S -D -u 2222 -G molly-brown molly-brown
@@ -14,6 +14,8 @@ RUN addgroup molly-brown tty
 RUN mkdir -p /var/gemini
 RUN chown molly-brown:molly-brown /var/gemini
 
+RUN ln -sf /dev/stdout /home/molly-brown/access.log
+
 RUN apk --no-cache add \
     openssl \
     coreutils

rootfs/etc/confd/templates/molly.conf.tmpl

@@ -9,7 +9,7 @@ HomeDocBase = "users"
 GeminiExt = "gmi"
 DefaultLang = "{{ getenv "DEFAULT_LANG" "en" }}"
 AccessLog = "-"
-ErrorLog = ""
+ErrorLog = "-"
 ReadMollyFiles = true
 
 #

rootfs/etc/s6-overlay/s6-rc.d/molly-brown/run

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec molly-brown -c /etc/molly-brown/molly.conf -u molly-brown
+exec molly-brown -c /etc/molly-brown/molly.conf