diff --git a/scrapyd/Dockerfile b/scrapyd/Dockerfile index 94a1629..ae3a837 100644 --- a/scrapyd/Dockerfile +++ b/scrapyd/Dockerfile @@ -34,9 +34,7 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 627220E7 \ && rm -rf /var/lib/apt/lists/* ADD ./001-scrapyd /etc/scrapyd/conf.d/ -ADD ./supervisord.conf /etc/supervisor/supervisord.conf - -VOLUME /var/lib/scrapyd +ADD ./scrapyd.conf /etc/supervisor/conf.d/ EXPOSE 6800 9001 diff --git a/scrapyd/supervisord.conf b/scrapyd/scrapyd.conf similarity index 51% rename from scrapyd/supervisord.conf rename to scrapyd/scrapyd.conf index 9c1029f..1b72193 100644 --- a/scrapyd/supervisord.conf +++ b/scrapyd/scrapyd.conf @@ -3,21 +3,8 @@ port = :9001 username = admin password = {SHA}d033e22ae348aeb5660fc2140aec35850c4da997 -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[supervisord] -logfile=/var/log/supervisor/supervisord.log -pidfile=/var/run/supervisord.pid -childlogdir=/var/log/supervisor -nodaemon=true - -[supervisorctl] -serverurl=http://localhost:9001 - [program:scrapyd] command = /usr/bin/scrapyd -u scrapy -g nogroup --pidfile /var/run/scrapyd.pid -l /var/log/scrapyd/scrapyd.log -