From 53fe17b51549017d30251f61eaecb488de181b1c Mon Sep 17 00:00:00 2001 From: Thomas Quandalle Date: Thu, 16 Jun 2022 20:28:35 +0200 Subject: [PATCH] change docker run command --- Dockerfile | 2 +- scripts/run.sh | 21 --------------------- scripts/supervisor.conf | 39 --------------------------------------- 3 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 scripts/run.sh delete mode 100644 scripts/supervisor.conf diff --git a/Dockerfile b/Dockerfile index 63f2f51..186b8c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,4 +112,4 @@ EXPOSE 8080 HEALTHCHECK CMD curl --fail http://localhost:8080 || exit 1 WORKDIR / -CMD ["sh", "run.sh"] +CMD ["/agent/main", "run", "opensource", "8080"] diff --git a/scripts/run.sh b/scripts/run.sh deleted file mode 100644 index 8cf6ff5..0000000 --- a/scripts/run.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -autoremoval() { - partition=/dev/ - imagedir=/agent/data/recordings - clouddir=/agent/data/cloud - - while : - do - #find $imagedir -type f -mtime +2 -exec rm {} \; - #find $clouddir -type f -mtime +2 -exec rm {} \; - sleep 60 - done -} - -export LD_LIBRARY_PATH=/lib:/usr/lib:/usr/local/lib && ldconfig - -autoremoval & - -#/usr/bin/supervisord -n -c /etc/supervisord.conf -/agent/main run opensource 8080 diff --git a/scripts/supervisor.conf b/scripts/supervisor.conf deleted file mode 100644 index db28c12..0000000 --- a/scripts/supervisor.conf +++ /dev/null @@ -1,39 +0,0 @@ -; supervisor config file - -[unix_http_server] -file=/var/run/supervisor.sock ; (the path to the socket file) -chmod=0700 ; sockef file mode (default 0700) - -[supervisord] -logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log) -pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid) -childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP) - -; the below section must remain in the config file for RPC -; (supervisorctl/web interface) to work, additional interfaces may be -; added by defining them in separate rpcinterface: sections -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[supervisorctl] -serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket - -; The [include] section can just contain the "files" setting. This -; setting can list multiple files (separated by whitespace or -; newlines). It can also contain wildcards. The filenames are -; interpreted as relative to this file. Included files *cannot* -; include files themselves. - -[include] -files = /etc/supervisor/conf.d/*.conf - -[program:agent] -command=/agent/main run opensource 8080 -directory=/agent -autostart = true -autorestart = true -user = root -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0