jlusiardi
/
docker_nginx_auto_proxy
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

switched to debian8_python8 base image 

cleaned up code
This commit is contained in:
Joachim Lusiardi 2015-01-26 20:25:58 +01:00
parent 945a23ff32
commit 9bd00cca0c
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Dockerfile
View File

@ -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

5
nginx_proxy.py
View File

@ -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)