Compare commits

..

No commits in common. "main" and "1.6.5" have entirely different histories.
main ... 1.6.5

3 changed files with 13 additions and 39 deletions

View File

@ -1,4 +1,4 @@
FROM docker.io/alpine:3.20 AS builder FROM docker.io/alpine:3.19 AS builder
RUN apk add --no-cache \ RUN apk add --no-cache \
php83 \ php83 \
@ -15,18 +15,19 @@ RUN apk add --no-cache \
ENV COMPOSER_VERSION=2.6.6 ENV COMPOSER_VERSION=2.6.6
ENV COMPOSER_SHA256_SUM=72600201c73c7c4b218f1c0511b36d8537963e36aafa244757f52309f885b314 ENV COMPOSER_SHA256_SUM=72600201c73c7c4b218f1c0511b36d8537963e36aafa244757f52309f885b314
RUN wget https://getcomposer.org/download/$COMPOSER_VERSION/composer.phar -O /bin/composer RUN wget https://getcomposer.org/download/$COMPOSER_VERSION/composer.phar
RUN echo "$COMPOSER_SHA256_SUM /bin/composer" | sha256sum -c - || exit 1 RUN echo "$COMPOSER_SHA256_SUM composer.phar" | sha256sum -c - || exit 1
RUN chmod +x /bin/composer RUN mv composer.phar /usr/bin/composer
RUN chmod +x /usr/bin/composer
ENV VERSION=1.6.7 ENV VERSION=1.6.5
ENV SHA256_SUM=cf52515e65b2818cb02fd7a202c766367b8c54d8b7fea27dda9c81aa7ce1d3a6 ENV SHA256_SUM=164b72cb78de89d104741ee9090f4024e63bfada43949034844365f3fa70b5fd
RUN wget https://github.com/roundcube/roundcubemail/releases/download/$VERSION/roundcubemail-$VERSION-complete.tar.gz RUN wget https://github.com/roundcube/roundcubemail/releases/download/$VERSION/roundcubemail-$VERSION-complete.tar.gz
RUN echo "$SHA256_SUM roundcubemail-$VERSION-complete.tar.gz" | sha256sum -c - || exit 1 RUN echo "$SHA256_SUM roundcubemail-$VERSION-complete.tar.gz" | sha256sum -c - || exit 1
RUN mkdir -p /var/lib/roundcube RUN mkdir -p /var/lib/roundcube
RUN tar xzf roundcubemail-$VERSION-complete.tar.gz -C /var/lib/roundcube --strip 1 RUN tar xzf roundcubemail-$VERSION-complete.tar.gz -C /var/lib/roundcube --strip 1
FROM docker.io/thallian/php8-fpm:3.20-8.3 FROM docker.io/thallian/php8-fpm:3.19-8.3
RUN apk add --no-cache \ RUN apk add --no-cache \
openssl \ openssl \

View File

@ -1,99 +1,73 @@
[Roundcube](https://roundcube.net/) webmail interface with postgres backend and [Roundcube](https://roundcube.net/) webmail interface with postgres backend and oauth login.
oauth login.
# Environment Variables # Environment Variables
## DOMAINS ## DOMAINS
Semicolon seperated list of domains to listen to. Semicolon seperated list of domains to listen to.
## DB_USER ## DB_USER
Name of the database user. Name of the database user.
## DB_PASSWORD ## DB_PASSWORD
Password for the database user. Password for the database user.
## DB_HOST ## DB_HOST
Database host. Database host.
## DB_NAME ## DB_NAME
Database name. Database name.
## IMAP_HOST ## IMAP_HOST
- default: tls://%n - default: tls://%n
IMAP host to authenticate users against. IMAP host to authenticate users against.
## SMTP_HOST ## SMTP_HOST
- default: tls://%n - default: tls://%n
SMTP host for sending mails. SMTP host for sending mails.
## SMTP_PORT ## SMTP_PORT
- default: 587 - default: 587
Port for the SMTP host. Port for the SMTP host.
## SECRET_KEY ## SECRET_KEY
Secret key for session secrets. Secret key for session secrets.
## CIPHER_METHOD ## CIPHER_METHOD
- default: AES-256-CBC - default: AES-256-CBC
Encryption algorithm for session secrets. Encryption algorithm for session secrets.
## OAUTH_PROVIDER_NAME ## OAUTH_PROVIDER_NAME
Name of the oauth provider on the roundcube login page. Name of the oauth provider on the roundcube login page.
## OAUTH_CLIENT_ID ## OAUTH_CLIENT_ID
Client id for oauth login. Client id for oauth login.
## OAUTH_CLIENT_SECRET ## OAUTH_CLIENT_SECRET
Client secret for oauth login. Client secret for oauth login.
## OAUTH_AUTH_URI ## OAUTH_AUTH_URI
Auth uri for oauth login. Auth uri for oauth login.
Example for keycloak: Example for keycloak: `https://example.com/realms/master/protocol/openid-connect/auth`
`https://example.com/realms/master/protocol/openid-connect/auth`
## OAUTH_TOKEN_URI ## OAUTH_TOKEN_URI
Token uri for oauth login. Token uri for oauth login.
Example for keycloak: Example for keycloak: `https://example.com/realms/master/protocol/openid-connect/token`
`https://example.com/realms/master/protocol/openid-connect/token`
## OAUTH_IDENTITY_URI ## OAUTH_IDENTITY_URI
Userinfo uri for oauth login. Userinfo uri for oauth login.
Example for keycloak: Example for keycloak: `https://example.com/realms/master/protocol/openid-connect/userinfo`
`https://example.com/realms/master/protocol/openid-connect/userinfo`
## MANAGESIEVE_HOST
Where to connect to managesieve.
# Ports # Ports
- 80 - 80
# Capabilities # Capabilities
- CHOWN - CHOWN
- DAC_OVERRIDE - DAC_OVERRIDE
- NET_BIND_SERVICE - NET_BIND_SERVICE

View File

@ -36,7 +36,7 @@ $config['username_domain'] = '%d';
$config['username_domain_forced'] = true; $config['username_domain_forced'] = true;
$config['password_charset'] = 'UTF-8'; $config['password_charset'] = 'UTF-8';
$config['plugins'] = array('archive', 'managesieve', 'zipdownload'); $config['plugins'] = array('archive', 'zipdownload');
$config['spellcheck_engine'] = 'pspell'; $config['spellcheck_engine'] = 'pspell';
$config['default_charset'] = 'UTF-8'; $config['default_charset'] = 'UTF-8';
@ -52,4 +52,3 @@ $config['oauth_scope'] = 'email profile openid';
$config['oauth_auth_parameters'] = []; $config['oauth_auth_parameters'] = [];
$config['oauth_identity_fields'] = ['preferred_username']; $config['oauth_identity_fields'] = ['preferred_username'];
$config['oauth_login_redirect'] = true; $config['oauth_login_redirect'] = true;
$config['managesieve_host'] = '{{getenv "MANAGESIEVE_HOST"}}';