From: Thomas Bruederli <redacted>
Date: Mon, 5 Oct 2020 21:24:29 +0000 (+0200)
Subject: Bring back deleted `docker-compose.yml` files used by Travis-CI
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=728b9125ab599d86a25c4301563dfa8f53c5197c;p=roundcube-roundcubemail-docker.git

Bring back deleted `docker-compose.yml` files used by Travis-CI
---

diff --git a/.travis.yml b/.travis.yml
index c3020ce..a0a015a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ script:
   - docker-compose ps
   - docker-compose logs
   - docker-compose ps "roundcubedb" | grep "Up"
-  - docker-compose ps "roundcube" | grep "Up"
+  - docker-compose ps "roundcubemail" | grep "Up"
 
 notifications:
   email: false
diff --git a/apache/docker-compose.yml b/apache/docker-compose.yml
index d164892..bbbdbe6 100644
--- a/apache/docker-compose.yml
+++ b/apache/docker-compose.yml
@@ -1,10 +1,9 @@
 version: "2"
 
 services:
-  roundcube:
+  roundcubemail:
     build: ./
-    container_name: roundcube
-    #restart: always
+    container_name: roundcubemail
     depends_on:
       - roundcubedb
     links:
@@ -23,7 +22,6 @@ services:
   roundcubedb:
     image: mariadb:latest
     container_name: roundcubedb
-    restart: always
     command: --character_set_client=utf8 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --character-set-client-handshake=FALSE
     ports:
       - 3306:3306
@@ -34,48 +32,3 @@ services:
       - MYSQL_DATABASE=roundcube
       - MYSQL_USER=roundcube
       - MYSQL_PASSWORD=roundcubedbpass
-
-  # Sample mail server to use with RoundCube: https://github.com/tomav/docker-mailserver
-#  mailserver:
-#    image: tvial/docker-mailserver:latest
-#    hostname: mail
-#    domainname: <YOUR.DOMAIN.NAME>
-#    container_name: mail
-#    restart: always
-#    ports:
-#      # receiving email from other mailservers
-#      - "25:25"
-#      # SSL & TLS Client email submission (SMTP)
-#      - "465:465"
-#      - "587:587"
-#      # StartTLS & TLS/SSL IMAP client
-#      - "143:143"
-#      - "993:993"
-#      # POP3 & TLS/SSL POP3 client
-#      - "110:110"
-#      - "995:995"
-#      # Manage Sieve port
-#      - "4190:4190"
-#    environment:
-#      - DMS_DEBUG=0
-#      - ONE_DIR=1
-#      - ENABLE_CLAMAV=1
-#      - ENABLE_FAIL2BAN=1
-#      - ENABLE_POSTGREY=1
-#      - ENABLE_MANAGESIEVE=1
-#      # If you need SSL connection, you can provide your own certificates
-#      #- SSL_TYPE=manual
-#      #- SSL_CERT_PATH=/etc/letsencrypt/fullchain.pem
-#      #- SSL_KEY_PATH=/etc/letsencrypt/privkey.pem
-#    cap_add:
-#      - NET_ADMIN
-#      - SYS_PTRACE
-#    volumes:
-#      - /srv/mail/data:/var/mail
-#      - /srv/mail/state:/var/mail-state
-#      # For proper delivery, generate DKIM keys in /srv/mail/setup
-#      - /srv/mail/setup:/tmp/docker-mailserver
-#      - /etc/localtime:/etc/localtime:ro
-#      - /etc/timezone:/etc/timezone:ro
-#      # If you need SSL connection, you can provide your own certificates
-#      # - ./certs:/etc/letsencrypt
diff --git a/fpm-alpine/docker-compose.yml b/fpm-alpine/docker-compose.yml
new file mode 100644
index 0000000..3041c2f
--- /dev/null
+++ b/fpm-alpine/docker-compose.yml
@@ -0,0 +1,46 @@
+version: "2"
+
+services:
+  roundcubemail:
+    build: ./
+    container_name: roundcubemail
+    depends_on:
+      - roundcubedb
+    links:
+      - roundcubedb
+    ports:
+      - 9000:9000
+    volumes:
+      - /srv/roundcube/html:/var/www/html
+    environment:
+      - ROUNDCUBEMAIL_DB_TYPE=pgsql
+      - ROUNDCUBEMAIL_DB_HOST=roundcubedb # same as pgsql container name
+      - ROUNDCUBEMAIL_DB_NAME=roundcube # same as pgsql POSTGRES_DB env name
+      - ROUNDCUBEMAIL_DB_USER=roundcube # same as pgsql POSTGRES_USER env name
+      - ROUNDCUBEMAIL_DB_PASSWORD=roundcube # same as pgsql POSTGRES_PASSWORD env name
+
+  roundcubedb:
+    image: postgres:alpine
+    container_name: roundcubedb
+    ports:
+      - 5432:5432
+    volumes:
+      - /srv/roundcube/db:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_DB=roundcube
+      - POSTGRES_USER=roundcube
+      - POSTGRES_PASSWORD=roundcube
+
+  roundcubenginx:
+    image: nginx:alpine
+    container_name: roundcubenginx
+    ports:
+      - 80:80
+    depends_on:
+      - roundcubemail
+    links:
+      - roundcubemail
+    volumes:
+      - /srv/roundcube/html:/var/www/html
+    environment:
+      - NGINX_HOST=localhost # set your local domain or your live domain
diff --git a/fpm/docker-compose.yml b/fpm/docker-compose.yml
new file mode 100644
index 0000000..3524216
--- /dev/null
+++ b/fpm/docker-compose.yml
@@ -0,0 +1,46 @@
+version: "2"
+
+services:
+  roundcubemail:
+    build: ./
+    container_name: roundcubemail
+    depends_on:
+      - roundcubedb
+    links:
+      - roundcubedb
+    ports:
+      - 9000:9000
+    volumes:
+      - /srv/roundcube/html:/var/www/html
+    environment:
+      - ROUNDCUBEMAIL_DB_TYPE=pgsql
+      - ROUNDCUBEMAIL_DB_HOST=roundcubedb # same as pgsql container name
+      - ROUNDCUBEMAIL_DB_NAME=roundcube # same as pgsql POSTGRES_DB env name
+      - ROUNDCUBEMAIL_DB_USER=roundcube # same as pgsql POSTGRES_USER env name
+      - ROUNDCUBEMAIL_DB_PASSWORD=roundcube # same as pgsql POSTGRES_PASSWORD env name
+
+  roundcubedb:
+    image: postgres:latest
+    container_name: roundcubedb
+    ports:
+      - 5432:5432
+    volumes:
+      - /srv/roundcube/db:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_DB=roundcube
+      - POSTGRES_USER=roundcube
+      - POSTGRES_PASSWORD=roundcube
+
+  roundcubenginx:
+    image: nginx:latest
+    container_name: roundcubenginx
+    ports:
+      - 80:80
+    depends_on:
+      - roundcubemail
+    links:
+      - roundcubemail
+    volumes:
+      - /srv/roundcube/html:/var/www/html
+    environment:
+      - NGINX_HOST=localhost # set your local domain or your live domain