From 7e87ef3ea221adf5db8ca458a6454a07d1e61ec6 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sun, 11 Sep 2022 12:52:13 +0200 Subject: [PATCH 01/10] remove managesieve plugin --- rootfs/etc/confd/templates/config.inc.php.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/etc/confd/templates/config.inc.php.tmpl b/rootfs/etc/confd/templates/config.inc.php.tmpl index 1a46fac..c86a50e 100644 --- a/rootfs/etc/confd/templates/config.inc.php.tmpl +++ b/rootfs/etc/confd/templates/config.inc.php.tmpl @@ -34,7 +34,7 @@ $config['username_domain'] = '%d'; $config['username_domain_forced'] = true; $config['password_charset'] = 'UTF-8'; -$config['plugins'] = array('archive', 'managesieve', 'zipdownload'); +$config['plugins'] = array('archive', 'zipdownload'); $config['spellcheck_engine'] = 'pspell'; $config['default_charset'] = 'UTF-8'; From b4767957f36bfd177f63d1edcfc70f72b5195c1c Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 11 Nov 2022 07:41:28 +0000 Subject: [PATCH 02/10] Delete '.gitlab-ci.yml' --- .gitlab-ci.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index f5f21ec..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,18 +0,0 @@ -variables: - CONTAINER_NAME: thallian/roundcube - -build: - stage: build - image: - name: gcr.io/kaniko-project/executor:debug - entrypoint: [""] - script: - - mkdir -p /kaniko/.docker - - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json - - >- - /kaniko/executor - --context "$CI_PROJECT_DIR" - --dockerfile "$CI_PROJECT_DIR/Dockerfile" - --destination "$CONTAINER_NAME:$CI_COMMIT_SHA" - --destination "$CONTAINER_NAME:$CI_COMMIT_REF_NAME" - --destination "$CONTAINER_NAME:latest" From 690e6fe6395f993cf3845ff1ac868efc72fde144 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 11 Nov 2022 07:42:22 +0000 Subject: [PATCH 03/10] Add '.woodpecker.yml' --- .woodpecker.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .woodpecker.yml diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..14c7dc0 --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,11 @@ +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 \ No newline at end of file From fd5df047d1807090209f8e0234039a1778ad1557 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sun, 13 Nov 2022 10:28:52 +0100 Subject: [PATCH 04/10] listen on all interfaces --- rootfs/etc/confd/templates/nginx.conf.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/rootfs/etc/confd/templates/nginx.conf.tmpl b/rootfs/etc/confd/templates/nginx.conf.tmpl index 69289ed..c10328b 100644 --- a/rootfs/etc/confd/templates/nginx.conf.tmpl +++ b/rootfs/etc/confd/templates/nginx.conf.tmpl @@ -22,6 +22,7 @@ http { {{range $domain := split (getenv "DOMAINS") ";"}} server { + listen [::]:8080; listen 8080; server_name {{ $domain }}; From 0e4f1782083326181351d9439f2aad761b0acb1c Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Nov 2022 14:02:16 +0100 Subject: [PATCH 05/10] use php 8.1 --- Dockerfile | 93 +++++++++++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/Dockerfile b/Dockerfile index d095bd0..f078694 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,17 @@ -FROM docker.io/alpine:3.16 AS builder +FROM docker.io/alpine:3.17 AS builder RUN apk add --no-cache \ - php8 \ - php8-phar \ - php8-mbstring \ - php8-openssl \ - php8-ctype \ - php8-gd \ - php8-dom \ - php8-xml \ - php8-ldap \ - php8-xmlreader \ - php8-xmlwriter + 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 @@ -27,43 +27,42 @@ RUN echo "$SHA256_SUM roundcubemail-$VERSION-complete.tar.gz" | sha256sum -c - 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.16 +FROM docker.io/thallian/php8-fpm:3.17 RUN apk add --no-cache \ - openssl \ - tar \ - nginx \ - postgresql-client \ - aspell \ - ca-certificates \ - php8 \ - php8-imap \ - php8-dom \ - php8-json \ - php8-xml \ - php8-session \ - php8-pdo \ - php8-pdo_pgsql \ - php8-sockets \ - php8-exif \ - php8-iconv \ - php8-openssl \ - php8-mbstring \ - php8-sockets \ - php8-pecl-mcrypt \ - php8-zip \ - php8-pspell \ - php8-pecl-apcu \ - php8-gd \ - php8-ctype \ - php8-xmlreader \ - php8-xmlwriter \ - php8-tokenizer \ - php8-curl \ - php8-simplexml \ - php8-xml \ - php8-dom \ - php8-intl + 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 From 4811e61883ce2d55894cd748f8bc94ded163859c Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 25 Jan 2023 08:17:19 +0100 Subject: [PATCH 06/10] push to 1.6.1 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f078694..973d268 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,8 +20,8 @@ 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 +ENV VERSION=1.6.1 +ENV SHA256_SUM=46c2f6ba34bcb7e57e47cb034bf338e5fc7dcceddda9212a2ef3bd3146d97bed 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 From 6568947669a6a5aabc48bc4c20334c7ee72133ae Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 25 Jan 2023 12:47:06 +0100 Subject: [PATCH 07/10] set script name (https://github.com/roundcube/roundcubemail/issues/8878) --- rootfs/etc/confd/templates/config.inc.php.tmpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rootfs/etc/confd/templates/config.inc.php.tmpl b/rootfs/etc/confd/templates/config.inc.php.tmpl index c86a50e..27d3c5e 100644 --- a/rootfs/etc/confd/templates/config.inc.php.tmpl +++ b/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'; From a7341bac2cfdb62c6d32321272c48852e961343e Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 26 Sep 2023 15:41:34 +0200 Subject: [PATCH 08/10] push to 1.6.3 --- Dockerfile | 88 +++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/Dockerfile b/Dockerfile index 973d268..978a149 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,33 +1,33 @@ -FROM docker.io/alpine:3.17 AS builder +FROM docker.io/alpine:3.18 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 + php82 \ + php82-phar \ + php82-mbstring \ + php82-openssl \ + php82-ctype \ + php82-gd \ + php82-dom \ + php82-xml \ + php82-ldap \ + php82-xmlreader \ + php82-xmlwriter -ENV COMPOSER_VERSION=2.1.6 -ENV COMPOSER_SHA256_SUM=72524ccebcb071968eb83284507225fdba59f223719b2b3f333d76c8a9ac6b72 +ENV COMPOSER_VERSION=2.6.3 +ENV COMPOSER_SHA256_SUM=e58a390cac0df45ccf5a3d95ae94fa239eded8b7907fa2c8f752f020304fc9b1 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.1 -ENV SHA256_SUM=46c2f6ba34bcb7e57e47cb034bf338e5fc7dcceddda9212a2ef3bd3146d97bed +ENV VERSION=1.6.3 +ENV SHA256_SUM=5e60ccd50f62fb00c43d335ec08a9bdafbf2bdd02552256cc4009908b39ad98f 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 +FROM docker.io/thallian/php8-fpm:3.18-8.2 RUN apk add --no-cache \ openssl \ @@ -36,33 +36,33 @@ RUN apk add --no-cache \ 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 + php82 \ + php82-imap \ + php82-dom \ + php82-json \ + php82-xml \ + php82-session \ + php82-pdo \ + php82-pdo_pgsql \ + php82-sockets \ + php82-exif \ + php82-iconv \ + php82-openssl \ + php82-mbstring \ + php82-sockets \ + php82-zip \ + php82-pspell \ + php82-pecl-apcu \ + php82-gd \ + php82-ctype \ + php82-xmlreader \ + php82-xmlwriter \ + php82-tokenizer \ + php82-curl \ + php82-simplexml \ + php82-xml \ + php82-dom \ + php82-intl COPY --from=builder --chown=nginx:nginx /var/lib/roundcube /var/lib/roundcube From fc4e33a9b9462578a7f718bf3d299211a7f3d56d Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 1 Jan 2024 16:55:39 +0100 Subject: [PATCH 09/10] push to 1.6.5 --- .gitea/workflows/container.yaml | 12 ++++++ .woodpecker.yml | 11 ----- Containerfile | 74 +++++++++++++++++++++++++++++++++ Dockerfile | 74 --------------------------------- 4 files changed, 86 insertions(+), 85 deletions(-) create mode 100644 .gitea/workflows/container.yaml delete mode 100644 .woodpecker.yml create mode 100644 Containerfile delete mode 100644 Dockerfile diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml new file mode 100644 index 0000000..e48b3fd --- /dev/null +++ b/.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 }} diff --git a/.woodpecker.yml b/.woodpecker.yml deleted file mode 100644 index 14c7dc0..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/Containerfile b/Containerfile new file mode 100644 index 0000000..ceaac4e --- /dev/null +++ b/Containerfile @@ -0,0 +1,74 @@ +FROM docker.io/alpine:3.19 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 +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.5 +ENV SHA256_SUM=164b72cb78de89d104741ee9090f4024e63bfada43949034844365f3fa70b5fd +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.19-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 diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 978a149..0000000 --- a/Dockerfile +++ /dev/null @@ -1,74 +0,0 @@ -FROM docker.io/alpine:3.18 AS builder - -RUN apk add --no-cache \ - php82 \ - php82-phar \ - php82-mbstring \ - php82-openssl \ - php82-ctype \ - php82-gd \ - php82-dom \ - php82-xml \ - php82-ldap \ - php82-xmlreader \ - php82-xmlwriter - -ENV COMPOSER_VERSION=2.6.3 -ENV COMPOSER_SHA256_SUM=e58a390cac0df45ccf5a3d95ae94fa239eded8b7907fa2c8f752f020304fc9b1 -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.3 -ENV SHA256_SUM=5e60ccd50f62fb00c43d335ec08a9bdafbf2bdd02552256cc4009908b39ad98f -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.18-8.2 - -RUN apk add --no-cache \ - openssl \ - tar \ - nginx \ - postgresql-client \ - aspell \ - ca-certificates \ - php82 \ - php82-imap \ - php82-dom \ - php82-json \ - php82-xml \ - php82-session \ - php82-pdo \ - php82-pdo_pgsql \ - php82-sockets \ - php82-exif \ - php82-iconv \ - php82-openssl \ - php82-mbstring \ - php82-sockets \ - php82-zip \ - php82-pspell \ - php82-pecl-apcu \ - php82-gd \ - php82-ctype \ - php82-xmlreader \ - php82-xmlwriter \ - php82-tokenizer \ - php82-curl \ - php82-simplexml \ - php82-xml \ - php82-dom \ - php82-intl - -COPY --from=builder --chown=nginx:nginx /var/lib/roundcube /var/lib/roundcube - -ADD /rootfs / - -EXPOSE 8080 - -ENV FPMUSER nginx -ENV FPMGROUP nginx From 4640dab8d2ee266da69721e8f127f9bfce6c229d Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 28 Mar 2024 14:57:43 +0100 Subject: [PATCH 10/10] push to 1.6.6 --- Containerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index ceaac4e..7b3c1c7 100644 --- a/Containerfile +++ b/Containerfile @@ -20,8 +20,8 @@ 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.5 -ENV SHA256_SUM=164b72cb78de89d104741ee9090f4024e63bfada43949034844365f3fa70b5fd +ENV VERSION=1.6.6 +ENV SHA256_SUM=c1b93a3edbe297457396b0a031d8b13c8a5dc30c9370704dfb9b2c1225017d52 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