diff --git a/Dockerfile b/Dockerfile index 0418745..0a1fe57 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,9 @@ -FROM debian:8 +FROM debian8_python3 MAINTAINER Joachim Lusiardi -RUN apt-get update; -RUN apt-get install -y python3-pip -RUN apt-get install -y nginx - +RUN apt-get update; \ + apt-get install -y nginx; ADD nginx.conf /etc/nginx.conf ADD start.sh /start.sh @@ -15,7 +13,6 @@ ADD nginx_proxy.py /nginx_proxy.py RUN chmod +x /nginx_proxy.py RUN pip3 install docker-py -VOLUME ["/keys"] EXPOSE 80 ENTRYPOINT /start.sh diff --git a/nginx_proxy.py b/nginx_proxy.py index ecbb4e3..3a7de2f 100755 --- a/nginx_proxy.py +++ b/nginx_proxy.py @@ -141,7 +141,6 @@ if __name__ == '__main__': except APIError: ip = '' -# logging.info(event['status'] + " " + ip) if ip == '': logging.info('removing %sproxy_%s', target_path, container_id) if os.path.exists(target_path + 'proxy_' + container_id): @@ -151,7 +150,3 @@ if __name__ == '__main__': reload_nginx_configuration() -# event['timestamp'] = datetime.datetime.fromtimestamp(event['time']).strftime('%Y-%m-%d %H:%M:%S'); -# print_json(event) - -