Compare commits
4 commits
c817a4eaf3
...
ddeab1fe89
Author | SHA1 | Date | |
---|---|---|---|
ddeab1fe89 | |||
a4420a89e7 | |||
d46f529f3d | |||
39ce8f5bec |
5 changed files with 77 additions and 12 deletions
|
@ -161,7 +161,7 @@ services:
|
||||||
|
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis
|
image: redis:7.2.4
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: redis-server --requirepass ${REDIS_HOST_PASSWORD}
|
command: redis-server --requirepass ${REDIS_HOST_PASSWORD}
|
||||||
networks:
|
networks:
|
||||||
|
|
|
@ -67,6 +67,7 @@ services:
|
||||||
- /var/run/docker.sock:/var/run/docker.sock:ro
|
- /var/run/docker.sock:/var/run/docker.sock:ro
|
||||||
environment:
|
environment:
|
||||||
# grant privileges as environment variables: https://github.com/Tecnativa/docker-socket-proxy#grant-or-revoke-access-to-certain-api-sections
|
# grant privileges as environment variables: https://github.com/Tecnativa/docker-socket-proxy#grant-or-revoke-access-to-certain-api-sections
|
||||||
|
- LOG_LEVEL=warning
|
||||||
- CONTAINERS=1
|
- CONTAINERS=1
|
||||||
- INFO=1
|
- INFO=1
|
||||||
- IMAGES=1 # for diun
|
- IMAGES=1 # for diun
|
||||||
|
|
|
@ -20,9 +20,9 @@ services:
|
||||||
- web
|
- web
|
||||||
- wallabag
|
- wallabag
|
||||||
volumes:
|
volumes:
|
||||||
- /var/dockervolumes/wallabag/images:/var/www/wallabag/web/assets/images
|
- ${VOLUMES_PATH}/wallabag/images:/var/www/wallabag/web/assets/images
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "wget" ,"--no-verbose", "--tries=1", "--spider", "http://localhost"]
|
test: ["CMD", "curl" ,"--fail", "http://localhost/api/info"]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 3s
|
timeout: 3s
|
||||||
labels:
|
labels:
|
||||||
|
@ -35,25 +35,21 @@ services:
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- redis
|
- redis
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: mariadb:10
|
image: mariadb:${MARIADB_VERSION}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
|
- MARIADB_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
|
||||||
networks:
|
networks:
|
||||||
- wallabag
|
- wallabag
|
||||||
volumes:
|
volumes:
|
||||||
- /var/dockervolumes/wallabag/db:/var/lib/mysql
|
- /var/dockervolumes/wallabag/db:/var/lib/mysql
|
||||||
healthcheck:
|
|
||||||
test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
|
|
||||||
interval: 10s
|
|
||||||
timeout: 3s
|
|
||||||
labels:
|
labels:
|
||||||
- "docker.group=wallabag"
|
- "docker.group=wallabag"
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis
|
image: redis:7.2.4
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- wallabag
|
- wallabag
|
||||||
|
|
|
@ -4,6 +4,7 @@ services:
|
||||||
image: nginx:stable
|
image: nginx:stable
|
||||||
volumes:
|
volumes:
|
||||||
- ${HTML}:/usr/share/nginx/html:ro
|
- ${HTML}:/usr/share/nginx/html:ro
|
||||||
|
- $PWD/nginx.conf:/etc/nginx/nginx.conf:ro
|
||||||
networks:
|
networks:
|
||||||
- web
|
- web
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
67
www/nginx.conf
Normal file
67
www/nginx.conf
Normal file
|
@ -0,0 +1,67 @@
|
||||||
|
user nginx;
|
||||||
|
worker_processes auto;
|
||||||
|
|
||||||
|
error_log /var/log/nginx/error.log notice;
|
||||||
|
pid /var/run/nginx.pid;
|
||||||
|
|
||||||
|
|
||||||
|
events {
|
||||||
|
worker_connections 1024;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
http {
|
||||||
|
include /etc/nginx/mime.types;
|
||||||
|
default_type application/octet-stream;
|
||||||
|
|
||||||
|
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
||||||
|
'$status $body_bytes_sent "$http_referer" '
|
||||||
|
'"$http_user_agent" "$http_x_forwarded_for"';
|
||||||
|
|
||||||
|
access_log /var/log/nginx/access.log main;
|
||||||
|
|
||||||
|
sendfile on;
|
||||||
|
#tcp_nopush on;
|
||||||
|
|
||||||
|
keepalive_timeout 65;
|
||||||
|
|
||||||
|
#gzip on;
|
||||||
|
|
||||||
|
# include /etc/nginx/conf.d/*.conf;
|
||||||
|
############################################
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
listen [::]:80;
|
||||||
|
server_name localhost;
|
||||||
|
|
||||||
|
#access_log /var/log/nginx/host.access.log main;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
index index.html index.htm;
|
||||||
|
}
|
||||||
|
|
||||||
|
#error_page 404 /404.html;
|
||||||
|
|
||||||
|
# redirect server error pages to the static page /50x.html
|
||||||
|
#
|
||||||
|
error_page 500 502 503 504 /50x.html;
|
||||||
|
location = /50x.html {
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
}
|
||||||
|
|
||||||
|
# hide .git folder
|
||||||
|
location ~ /\.git {
|
||||||
|
deny all;
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ /Readme.md {
|
||||||
|
deny all;
|
||||||
|
return 404;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
# include /etc/nginx/conf.d/*.conf;
|
||||||
|
}
|
Loading…
Reference in a new issue