Skip to content

Commit

Permalink
Use Alpine Linux in examples and use default user
Browse files Browse the repository at this point in the history
  • Loading branch information
J0WI committed Nov 15, 2018
1 parent 7914073 commit a8937e6
Show file tree
Hide file tree
Showing 27 changed files with 22 additions and 29 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
- db.env

redis:
image: redis
image: redis:alpine
restart: always

app:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM nextcloud:fpm
FROM nextcloud:fpm-alpine

COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
- db.env

redis:
image: redis
image: redis:alpine
restart: always

app:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM nginx
FROM nginx:alpine

COPY nginx.conf /etc/nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
user www-data;
worker_processes 1;

error_log /var/log/nginx/error.log warn;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
- db.env

app:
image: nextcloud:fpm
image: nextcloud:fpm-alpine
restart: always
volumes:
- nextcloud:/var/www/html
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM nginx
FROM nginx:alpine

COPY nginx.conf /etc/nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
user www-data;
worker_processes 1;

error_log /var/log/nginx/error.log warn;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3'

services:
db:
image: postgres
image: postgres:alpine
restart: always
volumes:
- db:/var/lib/postgresql/data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ version: '3'

services:
db:
image: postgres
image: postgres:alpine
restart: always
volumes:
- db:/var/lib/postgresql/data
env_file:
- db.env

app:
image: nextcloud:fpm
image: nextcloud:fpm-alpine
restart: always
volumes:
- nextcloud:/var/www/html
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM nginx
FROM nginx:alpine

COPY nginx.conf /etc/nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
user www-data;
worker_processes 1;

error_log /var/log/nginx/error.log warn;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
- db.env

app:
image: nextcloud:fpm
image: nextcloud:fpm-alpine
restart: always
volumes:
- nextcloud:/var/www/html
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM nginx
FROM nginx:alpine

COPY nginx.conf /etc/nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
user www-data;
worker_processes 1;

error_log /var/log/nginx/error.log warn;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
- db.env

redis:
image: redis
image: redis:alpine
restart: always

app:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM nextcloud:fpm
FROM nextcloud:fpm-alpine

COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
- db.env

redis:
image: redis
image: redis:alpine
restart: always

app:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM nginx
FROM nginx:alpine

COPY nginx.conf /etc/nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
user www-data;
worker_processes 1;

error_log /var/log/nginx/error.log warn;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
- db.env

app:
image: nextcloud:fpm
image: nextcloud:fpm-alpine
restart: always
volumes:
- nextcloud:/var/www/html
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM nginx
FROM nginx:alpine

COPY nginx.conf /etc/nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
user www-data;
worker_processes 1;

error_log /var/log/nginx/error.log warn;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3'

services:
db:
image: postgres
image: postgres:alpine
restart: always
volumes:
- db:/var/lib/postgresql/data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ version: '3'

services:
db:
image: postgres
image: postgres:alpine
restart: always
volumes:
- db:/var/lib/postgresql/data
env_file:
- db.env

app:
image: nextcloud:fpm
image: nextcloud:fpm-alpine
restart: always
volumes:
- nextcloud:/var/www/html
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM nginx
FROM nginx:alpine

COPY nginx.conf /etc/nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
user www-data;
worker_processes 1;

error_log /var/log/nginx/error.log warn;
Expand Down

0 comments on commit a8937e6

Please sign in to comment.