Compare commits
No commits in common. "659e14a87de50f9ce8f2e563e022c7a4ca0d061b" and "70161b300754c9edc7cfb69ed89dcdddfa6b506d" have entirely different histories.
659e14a87d
...
70161b3007
@ -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 }}
|
|
11
.woodpecker.yml
Normal file
11
.woodpecker.yml
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
pipeline:
|
||||||
|
publish-docker-image:
|
||||||
|
image: plugins/kaniko
|
||||||
|
settings:
|
||||||
|
repo: docker.io/thallian/dovecot
|
||||||
|
tags: latest,${CI_COMMIT_SHA:0:8},${CI_COMMIT_TAG=pre}
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
username:
|
||||||
|
from_secret: DOCKER_USER
|
||||||
|
password:
|
||||||
|
from_secret: DOCKER_PW
|
@ -1,4 +1,4 @@
|
|||||||
FROM docker.io/alpine:3.19 as builder
|
FROM docker.io/alpine:3.16 as builder
|
||||||
|
|
||||||
RUN apk --no-cache add \
|
RUN apk --no-cache add \
|
||||||
rpcgen \
|
rpcgen \
|
||||||
@ -6,7 +6,7 @@ RUN apk --no-cache add \
|
|||||||
make \
|
make \
|
||||||
openssl \
|
openssl \
|
||||||
openssl-dev \
|
openssl-dev \
|
||||||
lua5.1-dev \
|
lua-dev \
|
||||||
libsodium-dev \
|
libsodium-dev \
|
||||||
linux-pam-dev \
|
linux-pam-dev \
|
||||||
zlib-dev \
|
zlib-dev \
|
||||||
@ -16,15 +16,15 @@ RUN apk --no-cache add \
|
|||||||
icu-dev \
|
icu-dev \
|
||||||
inotify-tools-dev
|
inotify-tools-dev
|
||||||
|
|
||||||
ENV SHA256_SUM_DOVECOT=05b11093a71c237c2ef309ad587510721cc93bbee6828251549fc1586c36502d
|
ENV SHA256_SUM_DOVECOT=db5abcd87d7309659ea6b45b2cb6ee9c5f97486b2b719a5dd05a759e1f6a5c51
|
||||||
ENV DOVECOT_FILENAME=dovecot-2.3.21.tar.gz
|
ENV DOVECOT_FILENAME=dovecot-2.3.19.1.tar.gz
|
||||||
RUN wget https://www.dovecot.org/releases/2.3/$DOVECOT_FILENAME
|
RUN wget https://www.dovecot.org/releases/2.3/$DOVECOT_FILENAME
|
||||||
RUN echo "$SHA256_SUM_DOVECOT $DOVECOT_FILENAME" | sha256sum -c - || exit 1
|
RUN echo "$SHA256_SUM_DOVECOT $DOVECOT_FILENAME" | sha256sum -c - || exit 1
|
||||||
RUN mkdir /tmp/dovecot
|
RUN mkdir /tmp/dovecot
|
||||||
RUN tar xzf $DOVECOT_FILENAME -C /tmp/dovecot --strip 1
|
RUN tar xzf $DOVECOT_FILENAME -C /tmp/dovecot --strip 1
|
||||||
|
|
||||||
ENV SHA256_SUM_PIGEONHOLE=1ca71d2659076712058a72030288f150b2b076b0306453471c5261498d3ded27
|
ENV SHA256_SUM_PIGEONHOLE=637709a83fb1338c918e5398049f96b7aeb5ae00696794ed1e5a4d4c0ca3f688
|
||||||
ENV PIGEONHOLE_FILENAME=dovecot-2.3-pigeonhole-0.5.21.tar.gz
|
ENV PIGEONHOLE_FILENAME=dovecot-2.3-pigeonhole-0.5.19.tar.gz
|
||||||
RUN wget https://pigeonhole.dovecot.org/releases/2.3/$PIGEONHOLE_FILENAME
|
RUN wget https://pigeonhole.dovecot.org/releases/2.3/$PIGEONHOLE_FILENAME
|
||||||
RUN echo "$SHA256_SUM_PIGEONHOLE $PIGEONHOLE_FILENAME" | sha256sum -c - || exit 1
|
RUN echo "$SHA256_SUM_PIGEONHOLE $PIGEONHOLE_FILENAME" | sha256sum -c - || exit 1
|
||||||
RUN mkdir /tmp/pigeonhole
|
RUN mkdir /tmp/pigeonhole
|
||||||
@ -56,7 +56,7 @@ RUN cd /tmp/pigeonhole && \
|
|||||||
--disable-static && \
|
--disable-static && \
|
||||||
make && make install
|
make && make install
|
||||||
|
|
||||||
FROM docker.io/thallian/confd-env:3.19-3.1.6.2
|
FROM docker.io/thallian/confd-env:3.16
|
||||||
|
|
||||||
COPY --from=builder /lib/dovecot/ /lib/dovecot/
|
COPY --from=builder /lib/dovecot/ /lib/dovecot/
|
||||||
COPY --from=builder /libexec/dovecot/ /libexec/dovecot/
|
COPY --from=builder /libexec/dovecot/ /libexec/dovecot/
|
||||||
@ -77,11 +77,10 @@ RUN apk --no-cache add \
|
|||||||
openssl \
|
openssl \
|
||||||
ssmtp \
|
ssmtp \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
lua5.1-libs \
|
lua \
|
||||||
lua5.1-rapidjson \
|
lua-rapidjson \
|
||||||
curl \
|
curl \
|
||||||
inotify-tools \
|
inotify-tools
|
||||||
libssl3
|
|
||||||
|
|
||||||
RUN addgroup -g 150 dovecot
|
RUN addgroup -g 150 dovecot
|
||||||
RUN adduser -u 140 -h /dev/null -H -s /sbin/nologin -D -G dovecot dovecot
|
RUN adduser -u 140 -h /dev/null -H -s /sbin/nologin -D -G dovecot dovecot
|
@ -21,16 +21,3 @@ service auth {
|
|||||||
|
|
||||||
service auth-worker {
|
service auth-worker {
|
||||||
}
|
}
|
||||||
|
|
||||||
service anvil {
|
|
||||||
chroot =
|
|
||||||
}
|
|
||||||
service imap-login {
|
|
||||||
chroot =
|
|
||||||
}
|
|
||||||
service pop3-login {
|
|
||||||
chroot =
|
|
||||||
}
|
|
||||||
service ipc {
|
|
||||||
chroot =
|
|
||||||
}
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
protocols = imap lmtp sieve
|
protocols = imap lmtp sieve
|
||||||
listen = *, ::
|
listen = *
|
||||||
!include conf.d/*.conf
|
!include conf.d/*.conf
|
||||||
!include_try local.conf
|
!include_try local.conf
|
||||||
|
@ -36,7 +36,7 @@ function auth_userdb_lookup(req)
|
|||||||
end
|
end
|
||||||
|
|
||||||
if userJson[1].username == req.username then
|
if userJson[1].username == req.username then
|
||||||
return dovecot.auth.USERDB_RESULT_OK, "uid=vmail gid=vmail home=/var/lib/vmail/mail/" .. req.username
|
return dovecot.auth.USERDB_RESULT_OK, "uid=vmail gid=vmail home=/var/lib/vmail/mail/%n"
|
||||||
end
|
end
|
||||||
|
|
||||||
return dovecot.auth.USERDB_RESULT_USER_UNKNOWN, "no such user"
|
return dovecot.auth.USERDB_RESULT_USER_UNKNOWN, "no such user"
|
||||||
|
Loading…
Reference in New Issue
Block a user