use new logging config

.gitea/workflows/container.yaml

@@ -0,0 +1,12 @@
+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 }}

.gitlab-ci.yml

@@ -1,12 +0,0 @@
-stages:
-    - build
-
-variables:
-    IMAGE_NAME: thallian/molly-brown
-    CI_BUILD_ARCHS: "linux/amd64,linux/arm64"
-
-build:
-    stage: build
-    script:
-        - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
-        - docker buildx build --platform "$CI_BUILD_ARCHS" --progress plain --pull --tag "$IMAGE_NAME:$CI_COMMIT_SHA" --tag "$IMAGE_NAME:$CI_COMMIT_REF_NAME" --tag "$IMAGE_NAME:latest" --push .

Containerfile

@@ -1,11 +1,11 @@
-FROM golang:1.15.0-alpine3.12 AS builder
+FROM docker.io/golang:1.21-alpine3.19 AS builder
 
 ENV GO111MODULE=on
 
-ENV VERSION=48f9a206c03c0470e1c132b9667c6daa3583dada
+ENV VERSION=2068c3b02abf8f6a9160d1891d16a5237ab77a1b
-RUN go get tildegit.org/solderpunk/molly-brown@$VERSION
+RUN go install tildegit.org/solderpunk/molly-brown@$VERSION
 
-FROM thallian/confd-env:latest
+FROM docker.io/thallian/confd-env:3.19-3.1.6.2
 
 RUN addgroup -g 2222 molly-brown
 RUN adduser -h /home/molly-brown -S -D -u 2222 -G molly-brown molly-brown
@@ -14,8 +14,6 @@ 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

@@ -2,14 +2,14 @@
 #
 Port = 1965
 Hostname = "{{ getenv "HOST_NAME" }}"
-CertPath = "/etc/molly-brown/keys/{{ getenv "HOST_NAME" }}-cert.pem"
+CertPath = "/etc/molly-brown/keys/cert.pem"
-KeyPath = "/etc/molly-brown/keys/{{ getenv "HOST_NAME" }}-key.pem"
+KeyPath = "/etc/molly-brown/keys/key.pem"
 DocBase = "/var/gemini/"
 HomeDocBase = "users"
 GeminiExt = "gmi"
 DefaultLang = "{{ getenv "DEFAULT_LANG" "en" }}"
-AccessLog = "/home/molly-brown/access.log"
+AccessLog = "-"
-ErrorLog = "/home/molly-brown/access.log"
+ErrorLog = ""
 ReadMollyFiles = true
 
 #

rootfs/etc/fix-attrs.d/01-data

@@ -1 +0,0 @@
-/var/gemini/ true molly-brown:molly-brown 0666 0777

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

@@ -0,0 +1 @@
+confd

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

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

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

@@ -0,0 +1 @@
+longrun

rootfs/etc/services.d/molly-brown/run

@@ -1,3 +0,0 @@
-#!/usr/bin/with-contenv sh
-
-exec s6-setuidgid molly-brown molly-brown -c /etc/molly-brown/molly.conf