Remove custom config file. Fix command line arguments to use environment.
This commit is contained in:
parent
5265e55aa5
commit
ddaac07872
17
compose.yml
17
compose.yml
|
@ -4,7 +4,7 @@ version: "3.8"
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: dragas/thttpd
|
image: dragas/thttpd
|
||||||
command: ["/usr/sbin/thttpd", "-C", "/etc/thttpd.conf", "-D", "-l", "/dev/stderr"]
|
command: ["-D", "-l", "/dev/stderr", "-d", "/var/www/http/$HTTP_SUBDIR"]
|
||||||
networks:
|
networks:
|
||||||
- proxy
|
- proxy
|
||||||
deploy:
|
deploy:
|
||||||
|
@ -22,15 +22,6 @@ services:
|
||||||
- HTTP_SUBDIR
|
- HTTP_SUBDIR
|
||||||
volumes:
|
volumes:
|
||||||
- content:/var/www/http
|
- content:/var/www/http
|
||||||
configs:
|
|
||||||
- source: thttpd_conf
|
|
||||||
target: /etc/thttpd.conf
|
|
||||||
#healthcheck:
|
|
||||||
# test: ["CMD", "curl", "-f", "http://localhost"]
|
|
||||||
# interval: 30s
|
|
||||||
# timeout: 10s
|
|
||||||
# retries: 10
|
|
||||||
# start_period: 1m
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
content:
|
content:
|
||||||
|
@ -39,9 +30,3 @@ networks:
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
|
|
||||||
configs:
|
|
||||||
thttpd_conf:
|
|
||||||
name: ${STACK_NAME}_thttpd_conf_${THTTPD_DEFAULT_CONF_VERSION}
|
|
||||||
template_driver: golang
|
|
||||||
file: thttpd.conf
|
|
||||||
|
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
dir=/var/www/http/{{env "HTTP_SUBDIR"}}
|
|
||||||
vhost
|
|
||||||
chroot
|
|
||||||
user=thttpd
|
|
||||||
cgipat=**.cgi
|
|
||||||
logfile=/var/log/thttpd/thttpd.log
|
|
||||||
pidfile=/var/run/thttpd.pid
|
|
||||||
charset=utf-8
|
|
Loading…
Reference in New Issue