Merge pull request #1 from tmcolby/dev

tmcolby · web-flow · commit e73c2ad553a1 · 2020-08-06T19:20:22.000-07:00
On branch dev
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+venv*
+config.json
+__pycache__/
diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,12 @@
-FROM python:2.7-alpine
-MAINTAINER "Matjaž Finžgar" <matjaz@finzgar.net>
+FROM python:3.8-alpine
+
+ARG PORT=5000
 
 WORKDIR /app
+COPY . .
 
-COPY requirements.txt /app
 RUN pip install -r requirements.txt
 
-COPY . /app
 
-EXPOSE 5000
-CMD ["python", "webhooks.py"]
+EXPOSE ${PORT}
+CMD python webhooks.py $PORT
diff --git a/docker_cmds b/docker_cmds
@@ -0,0 +1,2 @@
+docker build . -t github-webhook
+docker run -d --name github-webhook -p 5000:5000 -v /home/tyson/dev/python-github-webhooks/hooks:/app/hooks -v /home/tyson/dev/python-github-webhooks/config.json:/app/config.json github-webhook
diff --git a/webhooks.py b/webhooks.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2014, 2015, 2016 Carlos Jenkins <carlos@jenkins.co.cr>
@@ -16,6 +17,7 @@
 # under the License.
 
 import logging
+import sys
 from sys import stderr, hexversion
 logging.basicConfig(stream=stderr)
 
@@ -70,7 +72,7 @@ def index():
             abort(403)
 
     # Enforce secret
-    secret = config.get('enforce_secret', '')
+    secret = config.get('enforce_secret', '').encode('utf-8')
     if secret:
         # Only SHA1 is supported
         header_signature = request.headers.get('X-Hub-Signature')
@@ -82,7 +84,7 @@ def index():
             abort(501)
 
         # HMAC requires the key to be bytes, but data is string
-        mac = hmac.new(str(secret), msg=request.data, digestmod='sha1')
+        mac = hmac.new(secret, msg=request.data, digestmod='sha1')
 
         # Python prior to 2.7.7 does not have hmac.compare_digest
         if hexversion >= 0x020707F0:
@@ -203,4 +205,7 @@ def index():
 
 
 if __name__ == '__main__':
-    application.run(debug=True, host='0.0.0.0')
+    port=5000
+    if sys.argv[1:]:
+        port=int(sys.argv[1])
+    application.run(host='0.0.0.0', port=port)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+venv*`
	`2`	`+config.json`
	`3`	`+__pycache__/`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+docker build . -t github-webhook`
	`2`	`+docker run -d --name github-webhook -p 5000:5000 -v /home/tyson/dev/python-github-webhooks/hooks:/app/hooks -v /home/tyson/dev/python-github-webhooks/config.json:/app/config.json github-webhook`