Compare commits

..

2 Commits

Author SHA1 Message Date
269df6a0c2
use new logging config
Some checks failed
Build Multiarch Container Image / call-reusable-workflow (push) Failing after 1m58s
2023-12-31 22:33:20 +01:00
df5346edca
push to version 2068c3b0 2023-12-31 20:46:43 +01:00
5 changed files with 18 additions and 19 deletions

View File

@ -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 }}

View File

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

View File

@ -1,11 +1,11 @@
FROM docker.io/golang:1.17.11-alpine3.16 AS builder
FROM docker.io/golang:1.21-alpine3.19 AS builder
ENV GO111MODULE=on
ENV VERSION=48f9a206c03c0470e1c132b9667c6daa3583dada
RUN go get tildegit.org/solderpunk/molly-brown@$VERSION
ENV VERSION=2068c3b02abf8f6a9160d1891d16a5237ab77a1b
RUN go install tildegit.org/solderpunk/molly-brown@$VERSION
FROM docker.io/thallian/confd-env:3.17
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

View File

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

View File

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