diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yaml index 1e288ef..01bb80c 100644 --- a/nextcloud/docker-compose.yaml +++ b/nextcloud/docker-compose.yaml @@ -161,7 +161,7 @@ services: redis: - image: redis:7.2.4 + image: redis restart: unless-stopped command: redis-server --requirepass ${REDIS_HOST_PASSWORD} networks: diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml index 96aff0c..d6033ba 100755 --- a/proxy/docker-compose.yaml +++ b/proxy/docker-compose.yaml @@ -67,7 +67,6 @@ services: - /var/run/docker.sock:/var/run/docker.sock:ro environment: # 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 - INFO=1 - IMAGES=1 # for diun diff --git a/wallabag/docker-compose.yaml b/wallabag/docker-compose.yaml index 0130a05..6433ff3 100644 --- a/wallabag/docker-compose.yaml +++ b/wallabag/docker-compose.yaml @@ -20,9 +20,9 @@ services: - web - wallabag volumes: - - ${VOLUMES_PATH}/wallabag/images:/var/www/wallabag/web/assets/images + - /var/dockervolumes/wallabag/images:/var/www/wallabag/web/assets/images healthcheck: - test: ["CMD", "curl" ,"--fail", "http://localhost/api/info"] + test: ["CMD", "wget" ,"--no-verbose", "--tries=1", "--spider", "http://localhost"] interval: 10s timeout: 3s labels: @@ -35,21 +35,25 @@ services: depends_on: - db - redis - + db: - image: mariadb:${MARIADB_VERSION} + image: mariadb:10 restart: unless-stopped environment: - - MARIADB_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} networks: - wallabag volumes: - /var/dockervolumes/wallabag/db:/var/lib/mysql + healthcheck: + test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] + interval: 10s + timeout: 3s labels: - "docker.group=wallabag" - + redis: - image: redis:7.2.4 + image: redis restart: unless-stopped networks: - wallabag diff --git a/www/docker-compose.yaml b/www/docker-compose.yaml index 48dd903..b2dd6c4 100644 --- a/www/docker-compose.yaml +++ b/www/docker-compose.yaml @@ -4,7 +4,6 @@ services: image: nginx:stable volumes: - ${HTML}:/usr/share/nginx/html:ro - - $PWD/nginx.conf:/etc/nginx/nginx.conf:ro networks: - web restart: unless-stopped diff --git a/www/nginx.conf b/www/nginx.conf deleted file mode 100644 index 73d1ce1..0000000 --- a/www/nginx.conf +++ /dev/null @@ -1,67 +0,0 @@ -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; -}