Merge pull request #538 from J0WI/alpine-eg

Use Alpine Linux in examples and use default user on nginx containers
This commit is contained in:
Tilo Spannagel 2018-11-20 23:19:02 +01:00 committed by GitHub
commit 0c16d10bf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 22 additions and 29 deletions

View File

@ -13,7 +13,7 @@ services:
- db.env - db.env
redis: redis:
image: redis image: redis:alpine
restart: always restart: always
app: app:

View File

@ -1,3 +1,3 @@
FROM nextcloud:fpm FROM nextcloud:fpm-alpine
COPY redis.config.php /usr/src/nextcloud/config/redis.config.php COPY redis.config.php /usr/src/nextcloud/config/redis.config.php

View File

@ -13,7 +13,7 @@ services:
- db.env - db.env
redis: redis:
image: redis image: redis:alpine
restart: always restart: always
app: app:

View File

@ -1,3 +1,3 @@
FROM nginx FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf

View File

@ -1,4 +1,3 @@
user www-data;
worker_processes 1; worker_processes 1;
error_log /var/log/nginx/error.log warn; error_log /var/log/nginx/error.log warn;

View File

@ -13,7 +13,7 @@ services:
- db.env - db.env
app: app:
image: nextcloud:fpm image: nextcloud:fpm-alpine
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html

View File

@ -1,3 +1,3 @@
FROM nginx FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf

View File

@ -1,4 +1,3 @@
user www-data;
worker_processes 1; worker_processes 1;
error_log /var/log/nginx/error.log warn; error_log /var/log/nginx/error.log warn;

View File

@ -2,7 +2,7 @@ version: '3'
services: services:
db: db:
image: postgres image: postgres:alpine
restart: always restart: always
volumes: volumes:
- db:/var/lib/postgresql/data - db:/var/lib/postgresql/data

View File

@ -2,7 +2,7 @@ version: '3'
services: services:
db: db:
image: postgres image: postgres:alpine
restart: always restart: always
volumes: volumes:
- db:/var/lib/postgresql/data - db:/var/lib/postgresql/data
@ -10,7 +10,7 @@ services:
- db.env - db.env
app: app:
image: nextcloud:fpm image: nextcloud:fpm-alpine
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html

View File

@ -1,3 +1,3 @@
FROM nginx FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf

View File

@ -1,4 +1,3 @@
user www-data;
worker_processes 1; worker_processes 1;
error_log /var/log/nginx/error.log warn; error_log /var/log/nginx/error.log warn;

View File

@ -13,7 +13,7 @@ services:
- db.env - db.env
app: app:
image: nextcloud:fpm image: nextcloud:fpm-alpine
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html

View File

@ -1,3 +1,3 @@
FROM nginx FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf

View File

@ -1,4 +1,3 @@
user www-data;
worker_processes 1; worker_processes 1;
error_log /var/log/nginx/error.log warn; error_log /var/log/nginx/error.log warn;

View File

@ -13,7 +13,7 @@ services:
- db.env - db.env
redis: redis:
image: redis image: redis:alpine
restart: always restart: always
app: app:

View File

@ -1,3 +1,3 @@
FROM nextcloud:fpm FROM nextcloud:fpm-alpine
COPY redis.config.php /usr/src/nextcloud/config/redis.config.php COPY redis.config.php /usr/src/nextcloud/config/redis.config.php

View File

@ -13,7 +13,7 @@ services:
- db.env - db.env
redis: redis:
image: redis image: redis:alpine
restart: always restart: always
app: app:

View File

@ -1,3 +1,3 @@
FROM nginx FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf

View File

@ -1,4 +1,3 @@
user www-data;
worker_processes 1; worker_processes 1;
error_log /var/log/nginx/error.log warn; error_log /var/log/nginx/error.log warn;

View File

@ -13,7 +13,7 @@ services:
- db.env - db.env
app: app:
image: nextcloud:fpm image: nextcloud:fpm-alpine
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html

View File

@ -1,3 +1,3 @@
FROM nginx FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf

View File

@ -1,4 +1,3 @@
user www-data;
worker_processes 1; worker_processes 1;
error_log /var/log/nginx/error.log warn; error_log /var/log/nginx/error.log warn;

View File

@ -2,7 +2,7 @@ version: '3'
services: services:
db: db:
image: postgres image: postgres:alpine
restart: always restart: always
volumes: volumes:
- db:/var/lib/postgresql/data - db:/var/lib/postgresql/data

View File

@ -2,7 +2,7 @@ version: '3'
services: services:
db: db:
image: postgres image: postgres:alpine
restart: always restart: always
volumes: volumes:
- db:/var/lib/postgresql/data - db:/var/lib/postgresql/data
@ -10,7 +10,7 @@ services:
- db.env - db.env
app: app:
image: nextcloud:fpm image: nextcloud:fpm-alpine
restart: always restart: always
volumes: volumes:
- nextcloud:/var/www/html - nextcloud:/var/www/html

View File

@ -1,3 +1,3 @@
FROM nginx FROM nginx:alpine
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf

View File

@ -1,4 +1,3 @@
user www-data;
worker_processes 1; worker_processes 1;
error_log /var/log/nginx/error.log warn; error_log /var/log/nginx/error.log warn;