Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Alpine Linux in examples and use default user on nginx containers #538

Merged
merged 1 commit into from
Nov 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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