push to 1.6.7

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

.woodpecker.yml

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

Containerfile

@@ -0,0 +1,73 @@
+FROM docker.io/alpine:3.20 AS builder
+
+RUN apk add --no-cache \
+  php83 \
+  php83-phar \
+  php83-mbstring \
+  php83-openssl \
+  php83-ctype \
+  php83-gd \
+  php83-dom \
+  php83-xml \
+  php83-ldap \
+  php83-xmlreader \
+  php83-xmlwriter
+
+ENV COMPOSER_VERSION=2.6.6
+ENV COMPOSER_SHA256_SUM=72600201c73c7c4b218f1c0511b36d8537963e36aafa244757f52309f885b314
+RUN wget https://getcomposer.org/download/$COMPOSER_VERSION/composer.phar -O /bin/composer
+RUN echo "$COMPOSER_SHA256_SUM  /bin/composer" | sha256sum -c - || exit 1
+RUN chmod +x /bin/composer
+
+ENV VERSION=1.6.7
+ENV SHA256_SUM=cf52515e65b2818cb02fd7a202c766367b8c54d8b7fea27dda9c81aa7ce1d3a6
+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 mkdir -p /var/lib/roundcube
+RUN tar xzf roundcubemail-$VERSION-complete.tar.gz -C /var/lib/roundcube --strip 1
+
+FROM docker.io/thallian/php8-fpm:3.20-8.3
+
+RUN apk add --no-cache \
+  openssl \
+  tar \
+  nginx \
+  postgresql-client \
+  aspell \
+  ca-certificates \
+  php83 \
+  php83-imap \
+  php83-dom \
+  php83-json \
+  php83-xml \
+  php83-session \
+  php83-pdo \
+  php83-pdo_pgsql \
+  php83-sockets \
+  php83-exif \
+  php83-iconv \
+  php83-openssl \
+  php83-mbstring \
+  php83-sockets \
+  php83-zip \
+  php83-pspell \
+  php83-pecl-apcu \
+  php83-gd \
+  php83-ctype \
+  php83-xmlreader \
+  php83-xmlwriter \
+  php83-tokenizer \
+  php83-curl \
+  php83-simplexml \
+  php83-xml \
+  php83-dom \
+  php83-intl
+
+COPY --from=builder --chown=nginx:nginx /var/lib/roundcube /var/lib/roundcube
+
+ADD /rootfs /
+
+EXPOSE 8080
+
+ENV FPMUSER nginx
+ENV FPMGROUP nginx

Dockerfile

@@ -1,74 +0,0 @@
-FROM docker.io/alpine:3.17 AS builder
-
-RUN apk add --no-cache \
-  php81 \
-  php81-phar \
-  php81-mbstring \
-  php81-openssl \
-  php81-ctype \
-  php81-gd \
-  php81-dom \
-  php81-xml \
-  php81-ldap \
-  php81-xmlreader \
-  php81-xmlwriter
-
-ENV COMPOSER_VERSION=2.1.6
-ENV COMPOSER_SHA256_SUM=72524ccebcb071968eb83284507225fdba59f223719b2b3f333d76c8a9ac6b72
-RUN wget https://getcomposer.org/download/$COMPOSER_VERSION/composer.phar
-RUN echo "$COMPOSER_SHA256_SUM  composer.phar" | sha256sum -c - || exit 1
-RUN mv composer.phar /usr/bin/composer
-RUN chmod +x /usr/bin/composer
-
-ENV VERSION=1.6.0
-ENV SHA256_SUM=2409ccdfe2e465f086cb9fc18c88dfe0aaf6ccc23924564975061209921694ba
-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 mkdir -p /var/lib/roundcube
-RUN tar xzf roundcubemail-$VERSION-complete.tar.gz -C /var/lib/roundcube --strip 1
-
-FROM docker.io/thallian/php8-fpm:3.17
-
-RUN apk add --no-cache \
-  openssl \
-  tar \
-  nginx \
-  postgresql-client \
-  aspell \
-  ca-certificates \
-  php81 \
-  php81-imap \
-  php81-dom \
-  php81-json \
-  php81-xml \
-  php81-session \
-  php81-pdo \
-  php81-pdo_pgsql \
-  php81-sockets \
-  php81-exif \
-  php81-iconv \
-  php81-openssl \
-  php81-mbstring \
-  php81-sockets \
-  php81-zip \
-  php81-pspell \
-  php81-pecl-apcu \
-  php81-gd \
-  php81-ctype \
-  php81-xmlreader \
-  php81-xmlwriter \
-  php81-tokenizer \
-  php81-curl \
-  php81-simplexml \
-  php81-xml \
-  php81-dom \
-  php81-intl
-
-COPY --from=builder --chown=nginx:nginx /var/lib/roundcube /var/lib/roundcube
-
-ADD /rootfs /
-
-EXPOSE 8080
-
-ENV FPMUSER nginx
-ENV FPMGROUP nginx

README.md

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

rootfs/etc/confd/templates/config.inc.php.tmpl

@@ -15,6 +15,8 @@ $config['imap_conn_options'] = array(
   ),
 );
 
+$config['request_path'] = 'SCRIPT_NAME';
+
 $config['smtp_host'] = '{{getenv "SMTP_HOST" "tls://%n"}}:{{getenv "SMTP_PORT" "587"}}';
 $config['smtp_user'] = '%u';
 $config['smtp_pass'] = '%p';
@@ -34,7 +36,7 @@ $config['username_domain'] = '%d';
 $config['username_domain_forced'] = true;
 $config['password_charset'] = 'UTF-8';
 
-$config['plugins'] = array('archive', 'zipdownload');
+$config['plugins'] = array('archive', 'managesieve', 'zipdownload');
 
 $config['spellcheck_engine'] = 'pspell';
 $config['default_charset'] = 'UTF-8';
@@ -50,3 +52,4 @@ $config['oauth_scope'] = 'email profile openid';
 $config['oauth_auth_parameters'] = [];
 $config['oauth_identity_fields'] = ['preferred_username'];
 $config['oauth_login_redirect'] = true;
+$config['managesieve_host'] = '{{getenv "MANAGESIEVE_HOST"}}';