upgrade discourse-virtmail plugin

Author: mortbauer

Dockerfile

@@ -33,7 +33,21 @@ RUN --mount=type=cache,target=/var/cache/apt \
     vim-tiny \
     && rm -rf /var/lib/apt/lists/*
 
+FROM base AS imagemagick_builder
+RUN apt update && \
+DEBIAN_FRONTEND=noninteractive apt-get -y install wget \
+    autoconf build-essential \
+    git \
+    cmake \
+    gnupg \
+    libpcre3-dev \
+    libfreetype6-dev \
+    libbrotli-dev
 
+ADD discourse_docker/image/base/install-imagemagick /tmp/install-imagemagick
+RUN /tmp/install-imagemagick
+
+FROM base AS complete
 # add node and npm to path so the commands are available
 # ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules
 # ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
@@ -83,7 +97,7 @@ ENV DISCOURSE_CHECKLIST_VERSION=6fcf9fed5c3ae3baf9ddd1cca9cef4dc089996c1
 ENV DISCOURSE_SOLVED_VERSION=f7bbffa6173b6e06a232e2eeaaef1e4da2d9cb8c
 ENV DISCOURSE_GROUP_GLOBAL_NOTICE_VERSION=598c3f22d000d9eb11df073f8e8d749797624653
 ENV DISCOURSE_MULTI_SSO_VERSION=e19fc0a860613a10dfc1e080484e3f2e76009da8
-ENV DISCOURSE_VIRTMAIL_VERSION=bb6ea6dee2db7e5ecdfd7e606398e3e4a2ce37bd
+ENV DISCOURSE_VIRTMAIL_VERSION=7290b57663c73b1b888ddec7e12cd8f121bbc259
 
 RUN cd plugins \
     && curl -L https://github.com/discourse/discourse-assign/archive/${DISCOURSE_ASSIGN_VERSION}.tar.gz | tar -xz \
@@ -107,26 +121,13 @@ RUN cd plugins \
     && curl -L https://github.com/foodcoopsat/discourse-virtmail/archive/${DISCOURSE_VIRTMAIL_VERSION}.tar.gz | tar -xz \
     && mv discourse-virtmail-* discourse-virtmail
 
+# COPY plugins/discourse-virtmail plugins/discourse-virtmail
+
 # RUN cd app/assets/javascripts/discourse && chown discourse:discourse -R . && su discourse -c 'ember build -prod'
 
 # USER root
 
-FROM base AS imagemagick_builder
-RUN apt update && \
-DEBIAN_FRONTEND=noninteractive apt-get -y install wget \
-    autoconf build-essential \
-    git \
-    cmake \
-    gnupg \
-    libpcre3-dev \
-    libfreetype6-dev \
-    libbrotli-dev
-
-ADD discourse_docker/image/base/install-imagemagick /tmp/install-imagemagick
-RUN /tmp/install-imagemagick
-
-
-FROM base AS builder
+FROM complete AS builder
 
 RUN curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
     && curl -fsSL https://packages.redis.io/gpg | apt-key add - \
@@ -151,7 +152,7 @@ RUN /etc/init.d/redis-server start \
     && su discourse -c 'bundle exec rake assets:precompile' \
     && su discourse -c 'bundle exec rake multisite:migrate'
 
-FROM base
+FROM complete
 
 RUN ln -sf /dev/stdout /home/discourse/discourse/log/production.log \
     && ln -sf /dev/stdout /var/log/nginx/access.log  \

docker-compose.yml

@@ -1,4 +1,37 @@
 services:
+    roundcube:
+      image: ghcr.io/foodcoopsat/roundcube
+      environment:
+        ROUNDCUBEMAIL_DB_TYPE: sqlite
+        ROUNDCUBEMAIL_DB_USER: roundcube
+        ROUNDCUBEMAIL_DB_HOST: mariadb
+        ROUNDCUBEMAIL_DB_SQLITE_PATH: /sqlite.db
+        ROUNDCUBEMAIL_DB_NAME: roundcube
+        ROUNDCUBEMAIL_DEFAULT_HOST: ssl://mail.local.at
+        ROUNDCUBEMAIL_DEFAULT_PORT: 993
+        ROUNDCUBEMAIL_SMTP_SERVER: ssl://mail.local.at
+        ROUNDCUBEMAIL_SMTP_PORT: 465
+        ROUNDCUBEMAIL_PLUGINS: archive,markasjunk,managesieve,nonce_login,zipdownload
+      healthcheck:
+        test: curl -f http://localhost/
+        start_interval: 10s
+      labels:
+        traefik.enable: "true"
+        traefik.http.middlewares.mail-admin.redirectregex.regex: ^https?://mail.local.at/admin(.*)
+        traefik.http.middlewares.mail-admin.redirectregex.replacement: https://app.local.at/discourse-virtmail/addresses
+        traefik.http.middlewares.roundcube-oauth.redirectregex.regex: ^https?://mail.local.at/index.php/login/oauth\?(.*)$$
+        traefik.http.middlewares.roundcube-oauth.redirectregex.replacement: https://mail.local.at/?_task=login&_action=oauth&$${1}
+        traefik.http.services.roundcube.loadbalancer.server.port: 80
+        traefik.http.routers.roundcube.entrypoints: https
+        traefik.http.routers.roundcube.middlewares: mail-admin,roundcube-oauth
+        traefik.http.routers.roundcube.rule: Host(`mail.local.at`)
+        traefik.http.routers.roundcube.tls: "true"
+        traefik.http.routers.roundcube.tls.domains[0].main: mail.local.at
+      volumes:
+          - "./dev_config/roundcube.php/:/usr/src/roundcubemail/config/config.inc.php:ro"
+          - "./dev_config/roundcube_secret:/run/secrets/roundcube_db_password"
+          - "./dev_config/roundcube_secret:/run/secrets/roundcube_des_key"
+          - "./dev_config/roundcube_secret:/run/secrets/roundcube_oauth_client_secret"
     mkcert:
       image: vishnunair/docker-mkcert
       environment:
@@ -42,6 +75,7 @@ services:
         build:
             context: .
         environment:
+            - RAILS_ENV=production
             - DISCOURSE_HOSTNAME=forum.test.net
             - DISCOURSE_DB_HOST=postgres
             - DISCOURSE_REDIS_HOST=redis
@@ -55,6 +89,8 @@ services:
             - ./dev_data/discourse_uploads:/home/discourse/discourse/public/uploads
             - ./dev_config/discourse-multisite.yml:/home/discourse/discourse/config/multisite.yml
             - ./dev_config/discourse.d/production.rb:/home/discourse/discourse/config/environments/production.rb
+            - ./dev_config/discourse.d/development.rb:/home/discourse/discourse/config/environments/development.rb
+            - ./plugins/discourse-virtmail:/home/discourse/discourse/plugins/discourse-virtmail/
         depends_on:
             - redis
             - postgres
@@ -68,9 +104,15 @@ services:
             traefik.http.routers.discourse.tls: "true"
             # traefik.http.routers.discourse.tls.certresolver: myresolver
             traefik.http.services.discourse.loadbalancer.server.port: 3000
+            # traefik.http.services.discourse.loadbalancer.server.port: 4200
         command: bundle exec rails server --binding '0.0.0.0'
+        # manually run docker compose exec -it discourse bin/rails server --port 3000
+        # also disable traefik on the nginx service
+        # command: node /usr/bin/pnpm --dir=app/assets/javascripts/discourse ember server --proxy http://localhost:3000 --host 0.0.0.0 --port 4200
         healthcheck:
             test: 'curl -f -H ''Host: forum.test.net'' http://localhost:3000/'
+            start_period: 10s
+            start_interval: 1s
     discourse_nginx:
         <<: *discourse
         command: nginx