summaryrefslogtreecommitdiffstats
path: root/.examples
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2018-11-15 15:49:33 +0100
committerJ0WI <J0WI@users.noreply.github.com>2018-11-20 20:24:22 +0100
commitaa5c0c192995e98836fc3c5435119583a78bef62 (patch)
tree827a8e0c84cf2e258628cf779f5943131986f4b3 /.examples
parentb6b83ba7ea521c38dc5521f66822b49bb5879c0e (diff)
Use Alpine Linux in examples and use default user
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Diffstat (limited to '.examples')
-rw-r--r--.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml2
-rw-r--r--.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile2
-rw-r--r--.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml2
-rw-r--r--.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/Dockerfile2
-rw-r--r--.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/nginx.conf1
-rw-r--r--.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml2
-rw-r--r--.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile2
-rw-r--r--.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf1
-rw-r--r--.examples/docker-compose/insecure/postgres/apache/docker-compose.yml2
-rw-r--r--.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml4
-rw-r--r--.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile2
-rw-r--r--.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf1
-rw-r--r--.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/docker-compose.yml2
-rw-r--r--.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/Dockerfile2
-rw-r--r--.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/nginx.conf1
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml2
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/Dockerfile2
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml2
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/Dockerfile2
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/nginx.conf1
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml2
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile2
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf1
-rw-r--r--.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml2
-rw-r--r--.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml4
-rw-r--r--.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile2
-rw-r--r--.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf1
27 files changed, 22 insertions, 29 deletions
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
index 2dc06e15..64c0570f 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
@@ -13,7 +13,7 @@ services:
- db.env
redis:
- image: redis
+ image: redis:alpine
restart: always
app:
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile
index 4a111610..0436d37d 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile
@@ -1,3 +1,3 @@
-FROM nextcloud:fpm
+FROM nextcloud:fpm-alpine
COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
index 49fafabc..424ef057 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
@@ -13,7 +13,7 @@ services:
- db.env
redis:
- image: redis
+ image: redis:alpine
restart: always
app:
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/Dockerfile b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/Dockerfile
index d6eac3e8..9e620aff 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/Dockerfile
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/nginx.conf b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/nginx.conf
index 2d14e230..49a19c35 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/nginx.conf
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/nginx.conf
@@ -1,4 +1,3 @@
-user www-data;
worker_processes 1;
error_log /var/log/nginx/error.log warn;
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
index 3596e989..eb91bbdb 100644
--- a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
@@ -13,7 +13,7 @@ services:
- db.env
app:
- image: nextcloud:fpm
+ image: nextcloud:fpm-alpine
restart: always
volumes:
- nextcloud:/var/www/html
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile b/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile
index d6eac3e8..9e620aff 100644
--- a/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile
+++ b/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
index 2d14e230..49a19c35 100644
--- a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
+++ b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
@@ -1,4 +1,3 @@
-user www-data;
worker_processes 1;
error_log /var/log/nginx/error.log warn;
diff --git a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml b/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
index f69bb72e..596568d6 100644
--- a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
services:
db:
- image: postgres
+ image: postgres:alpine
restart: always
volumes:
- db:/var/lib/postgresql/data
diff --git a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
index 7a1fab7d..b1ff459c 100644
--- a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
services:
db:
- image: postgres
+ image: postgres:alpine
restart: always
volumes:
- db:/var/lib/postgresql/data
@@ -10,7 +10,7 @@ services:
- db.env
app:
- image: nextcloud:fpm
+ image: nextcloud:fpm-alpine
restart: always
volumes:
- nextcloud:/var/www/html
diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile b/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile
index d6eac3e8..9e620aff 100644
--- a/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile
+++ b/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf
index 2d14e230..49a19c35 100644
--- a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf
+++ b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf
@@ -1,4 +1,3 @@
-user www-data;
worker_processes 1;
error_log /var/log/nginx/error.log warn;
diff --git a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/docker-compose.yml
index 6d1e70a9..3d60f7ee 100644
--- a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/docker-compose.yml
@@ -13,7 +13,7 @@ services:
- db.env
app:
- image: nextcloud:fpm
+ image: nextcloud:fpm-alpine
restart: always
volumes:
- nextcloud:/var/www/html
diff --git a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/Dockerfile
index d6eac3e8..9e620aff 100644
--- a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/nginx.conf
index 518f104d..26660646 100644
--- a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/nginx.conf
+++ b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/nginx.conf
@@ -1,4 +1,3 @@
-user www-data;
worker_processes 1;
error_log /var/log/nginx/error.log warn;
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
index b6ca391f..aaec5a2e 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
@@ -13,7 +13,7 @@ services:
- db.env
redis:
- image: redis
+ image: redis:alpine
restart: always
app:
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/Dockerfile
index 4a111610..0436d37d 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/Dockerfile
@@ -1,3 +1,3 @@
-FROM nextcloud:fpm
+FROM nextcloud:fpm-alpine
COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
index dd98915e..30aee4d9 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
@@ -13,7 +13,7 @@ services:
- db.env
redis:
- image: redis
+ image: redis:alpine
restart: always
app:
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/Dockerfile
index d6eac3e8..9e620aff 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/nginx.conf
index 518f104d..26660646 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/nginx.conf
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/nginx.conf
@@ -1,4 +1,3 @@
-user www-data;
worker_processes 1;
error_log /var/log/nginx/error.log warn;
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
index 17a656de..5fc70af1 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
@@ -13,7 +13,7 @@ services:
- db.env
app:
- image: nextcloud:fpm
+ image: nextcloud:fpm-alpine
restart: always
volumes:
- nextcloud:/var/www/html
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile
index d6eac3e8..9e620aff 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
index 518f104d..26660646 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
@@ -1,4 +1,3 @@
-user www-data;
worker_processes 1;
error_log /var/log/nginx/error.log warn;
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
index a2bda83b..2e40e8d7 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
services:
db:
- image: postgres
+ image: postgres:alpine
restart: always
volumes:
- db:/var/lib/postgresql/data
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
index 9bed1218..39e85f71 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
services:
db:
- image: postgres
+ image: postgres:alpine
restart: always
volumes:
- db:/var/lib/postgresql/data
@@ -10,7 +10,7 @@ services:
- db.env
app:
- image: nextcloud:fpm
+ image: nextcloud:fpm-alpine
restart: always
volumes:
- nextcloud:/var/www/html
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile
index d6eac3e8..9e620aff 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
index 518f104d..26660646 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
@@ -1,4 +1,3 @@
-user www-data;
worker_processes 1;
error_log /var/log/nginx/error.log warn;