From 79107428a609a5f9e39e1421e1f0940f3a76fe87 Mon Sep 17 00:00:00 2001
From: Timothee Gosselin <timothee@indie.host>
Date: Fri, 30 Nov 2018 17:48:19 +0100
Subject: [PATCH] use indiehost image + version as env
---
Dockerfile | 2 --
config/mail.config.php | 14 --------------
docker-compose.yml | 8 ++++----
3 files changed, 4 insertions(+), 20 deletions(-)
delete mode 100644 Dockerfile
delete mode 100644 config/mail.config.php
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 527f420..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM nextcloud:13-fpm
-COPY /config/mail.config.php /usr/src/nextcloud/config/
diff --git a/config/mail.config.php b/config/mail.config.php
deleted file mode 100644
index 6931de7..0000000
--- a/config/mail.config.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$CONFIG = array (
- 'mail_domain' => getenv('MAIL_DOMAIN'),
- 'mail_from_address' => getenv('MAIL_FROM'),
- 'mail_smtpmode' => 'smtp',
- 'mail_smtphost' => getenv('MAIL_HOST'),
- 'mail_smtpport' => getenv('MAIL_PORT'),
- 'mail_smtpauth' => 1,
- 'mail_smtpauthtype' => 'LOGIN',
- 'mail_smtpname' => getenv('SMTP_NAME'),
- 'mail_smtppassword' => getenv('MAIL_PASS'),
- 'mail_smtpsecure' => 'tls',
-);
-
diff --git a/docker-compose.yml b/docker-compose.yml
index 9ced5be..b3a74b4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,7 +23,7 @@ services:
- back
- lb_web
app:
- build: .
+ image: indiehosters/nextcloud:${NEXTCLOUD_VERSION:-latest}
links:
- db
volumes:
@@ -46,7 +46,7 @@ services:
networks:
- back
db:
- image: mysql:5.7
+ image: mysql:${MYSQL_VERSION:-5.7}
volumes:
- ./mysql/runtime:/var/lib/mysql
environment:
@@ -54,11 +54,11 @@ services:
networks:
- back
redis:
- image: redis
+ image: redis:${REDIS_VERSION:-latest}
networks:
- back
cron:
- image: nextcloud:13-fpm
+ image: indiehosters/nextcloud:${NEXTCLOUD_VERSION:-latest}
links:
- db
volumes_from:
--
GitLab